From 909d0f0bacd571d46d4e1d33e0fa400c9628ecfc Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Tue, 5 Jan 2016 20:52:17 +0700 Subject: [PATCH] network/openl2tp: Script cleanup. Signed-off-by: Willy Sudiarto Raharjo --- network/openl2tp/openl2tp.SlackBuild | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/network/openl2tp/openl2tp.SlackBuild b/network/openl2tp/openl2tp.SlackBuild index 68b43b448b..a16d787436 100644 --- a/network/openl2tp/openl2tp.SlackBuild +++ b/network/openl2tp/openl2tp.SlackBuild @@ -45,13 +45,12 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION - chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/Makefile.diff @@ -59,7 +58,7 @@ make OPT_CFLAGS="$SLKCFLAGS -Wno-error=unused-but-set-variable" \ SYS_LIBDIR=/usr/lib${LIBDIRSUFFIX} make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Move and fix perms on manpages @@ -78,9 +77,7 @@ sed -e "s,^OPENL2TPD_CONFIG_FILE=.*$,OPENL2TPD_CONFIG_FILE=/etc/openl2tpd.conf," cat $CWD/sample.conf > $PKG/etc/openl2tpd.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README CHANGES LICENSE COPYING INSTALL \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README CHANGES LICENSE COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install