diff options
author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-18 20:49:22 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-18 20:49:22 +0700 |
commit | 9c8cc6d9c60036a4ccdd3dafde8fd2ac0c7467a5 (patch) | |
tree | 5b64ad0a014b4703da0f5310e7c16a62220b51e0 /network | |
parent | be2613a636f66c14ce536054206e47a738a1b970 (diff) |
Multiple: Remove comments and whitespaces.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r-- | network/copy/copy.SlackBuild | 5 | ||||
-rw-r--r-- | network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild | 4 | ||||
-rw-r--r-- | network/t38modem/t38modem.SlackBuild | 18 |
3 files changed, 7 insertions, 20 deletions
diff --git a/network/copy/copy.SlackBuild b/network/copy/copy.SlackBuild index ebca147da0e8..9246f8f5cb6a 100644 --- a/network/copy/copy.SlackBuild +++ b/network/copy/copy.SlackBuild @@ -28,7 +28,6 @@ VERSION=${VERSION:-3.2.01.0481} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ] || [ -z "$SRCARCH" ]; then case "$( uname -m )" in i?86) @@ -39,7 +38,6 @@ if [ -z "$ARCH" ] || [ -z "$SRCARCH" ]; then ARCH=arm; SRCARCH=armv6h; ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ); SRCARCH=$( uname -m ); @@ -81,9 +79,6 @@ mkdir -pv $PKG/opt/$PRGNAM mkdir -pv $PKG/usr/share/applications/ cp -a $SRCARCH/* $PKG/opt/$PRGNAM -# Strip binaries and libraries - this can be done with 'make install-strip' -# in many source trees, and that's usually acceptable if so, but if not, -# use this: 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 diff --git a/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild b/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild index b18d42109b59..621b554b9323 100644 --- a/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild +++ b/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild @@ -29,12 +29,10 @@ TAG=${TAG:-_SBo} SRCNAM=plasma-nm -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -61,7 +59,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/t38modem/t38modem.SlackBuild b/network/t38modem/t38modem.SlackBuild index b4732252670b..b0690134e968 100644 --- a/network/t38modem/t38modem.SlackBuild +++ b/network/t38modem/t38modem.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2015 Christopher Walker Copperas Cove, TX # All rights reserved. -# +# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -67,16 +65,15 @@ tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz tar xvf $CWD/${PRGNAM}_${VERSION}-4.debian.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -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 {} \; +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # # Apply patches # -#patch -p1 <$TMP/debian/patches/simplify-makefile-new patch -p1 <$TMP/debian/patches/t38modem-opal3.10-patch patch -p1 <$TMP/debian/patches/spelling-error-fix patch -p1 <$TMP/debian/patches/opal-3.10.7.patch @@ -96,7 +93,6 @@ install -o root -g root obj_linux_*_opal/t38modem $PKG/usr/bin 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 -# Install documentation mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX cp -a \ $TMP/$PRGNAM-$VERSION/Changes.txt \ @@ -107,10 +103,8 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Copy slack-desc to ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Create package cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |