1 files changed, 13 insertions, 9 deletions
diff --git a/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild b/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild
index ee1a61ac37..94bd289771 100644
--- a/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild
+++ b/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for match-vamp-plugin
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -11,10 +11,13 @@
 # identical code, but a different md5sum (for one thing, it's compressed
 # with gzip, not bzip2), so I'm not bumping BUILD.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=match-vamp-plugin
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 TARNAME=$( echo $PRGNAM | cut -d- -f1,2 )
 
@@ -26,7 +29,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,11 +61,8 @@ rm -rf $TARNAME-$VERSION
 tar xvf $CWD/$TARNAME-$VERSION.tar.gz
 cd $TARNAME-$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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # 20151122 bkw: Grr. How long has this been broken?
 sed 's/-Wl,-Bstatic//' Makefile.linux > Makefile
@@ -83,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE