Multiple: Support alternate tarball name.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

11 files changed, 15 insertions, 15 deletions

diff --git a/system/blocks/blocks.SlackBuild b/system/blocks/blocks.SlackBuild
index ebff0f1b02c08..cfbdb7ce9d644 100644
--- a/system/blocks/blocks.SlackBuild
+++ b/system/blocks/blocks.SlackBuild
@@ -55,14 +55,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 # Prepare directories
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$COMMIT.tar.gz
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz || tar xvf $CWD/$COMMIT.tar.gz
 cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
diff --git a/system/gitolite/gitolite.SlackBuild b/system/gitolite/gitolite.SlackBuild
index 379f2091f9010..c0e62f96d2a77 100644
--- a/system/gitolite/gitolite.SlackBuild
+++ b/system/gitolite/gitolite.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild
index 2213f6220e1bd..ddd170f8ad7ee 100644
--- a/system/ktsuss/ktsuss.SlackBuild
+++ b/system/ktsuss/ktsuss.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$COMMIT
-tar xvf $CWD/$COMMIT.tar.gz
+tar xvf $CWD/$COMMIT.tar.gz || tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
 cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
diff --git a/system/multibootusb/multibootusb.SlackBuild b/system/multibootusb/multibootusb.SlackBuild
index 1c438447fc84d..58f9259d557db 100644
--- a/system/multibootusb/multibootusb.SlackBuild
+++ b/system/multibootusb/multibootusb.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/physlock/physlock.SlackBuild b/system/physlock/physlock.SlackBuild
index 0e4f734e28e5c..a5084e762de6d 100644
--- a/system/physlock/physlock.SlackBuild
+++ b/system/physlock/physlock.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/reptyr/reptyr.SlackBuild b/system/reptyr/reptyr.SlackBuild
index f42da43ba29e6..64e746f73d568 100644
--- a/system/reptyr/reptyr.SlackBuild
+++ b/system/reptyr/reptyr.SlackBuild
@@ -41,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION  # weird
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$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 \) \
diff --git a/system/scanmem/scanmem.SlackBuild b/system/scanmem/scanmem.SlackBuild
index 941c6f9856799..16a7003b993a5 100644
--- a/system/scanmem/scanmem.SlackBuild
+++ b/system/scanmem/scanmem.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/v$VERSION.zip
+unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/v$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild
index 37eb9234f55aa..004f487c6aa79 100644
--- a/system/tinyvm/tinyvm.SlackBuild
+++ b/system/tinyvm/tinyvm.SlackBuild
@@ -58,7 +58,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$SRCVERSION.tar.gz
+tar xvf $CWD/$SRCVERSION.tar.gz || tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
 cd $PRGNAM-$SRCVERSION
 
 ## default compiler (clang)
diff --git a/system/uptimed/uptimed.SlackBuild b/system/uptimed/uptimed.SlackBuild
index bc9384b204754..5319ecf835bd1 100644
--- a/system/uptimed/uptimed.SlackBuild
+++ b/system/uptimed/uptimed.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/z/z.SlackBuild b/system/z/z.SlackBuild
index 44e1fbca3284e..e531f295766d7 100644
--- a/system/z/z.SlackBuild
+++ b/system/z/z.SlackBuild
@@ -40,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/zopfli/zopfli.SlackBuild b/system/zopfli/zopfli.SlackBuild
index bf1b4974a5d41..a4cc1a214e2d6 100644
--- a/system/zopfli/zopfli.SlackBuild
+++ b/system/zopfli/zopfli.SlackBuild
@@ -46,7 +46,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \