Multiple: Support alternate tarball name.

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

7 files changed, 10 insertions, 12 deletions

diff --git a/python/PyXB/PyXB.SlackBuild b/python/PyXB/PyXB.SlackBuild
index 1f7c67aaac792..92097ccff2a67 100644
--- a/python/PyXB/PyXB.SlackBuild
+++ b/python/PyXB/PyXB.SlackBuild
@@ -59,8 +59,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf pyxb-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/pyxb-$PRGNAM-$VERSION.tar.gz
 cd pyxb-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/ps_mem/ps_mem.SlackBuild b/python/ps_mem/ps_mem.SlackBuild
index f77f629b1ef87..5dd178d02952f 100644
--- a/python/ps_mem/ps_mem.SlackBuild
+++ b/python/ps_mem/ps_mem.SlackBuild
@@ -56,13 +56,11 @@ fi
 
 set -e
 
-SRCVER="v3.6"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.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/python/pyPdf/pyPdf.SlackBuild b/python/pyPdf/pyPdf.SlackBuild
index 89330334575a8..1f5f7149a5046 100644
--- a/python/pyPdf/pyPdf.SlackBuild
+++ b/python/pyPdf/pyPdf.SlackBuild
@@ -50,8 +50,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+rm -rf $SRCDIRNAM-$VERSION
+tar xvf $CWD/$SRCDIRNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $SRCDIRNAM-$VERSION
 
 chown -R root:root .
diff --git a/python/python-ipcalc/python-ipcalc.SlackBuild b/python/python-ipcalc/python-ipcalc.SlackBuild
index 9d274df6fc0fa..9255fdcfa3380 100644
--- a/python/python-ipcalc/python-ipcalc.SlackBuild
+++ b/python/python-ipcalc/python-ipcalc.SlackBuild
@@ -62,8 +62,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+rm -rf $SRCNAM-$SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/python-whisper/python-whisper.SlackBuild b/python/python-whisper/python-whisper.SlackBuild
index bfdca3622c4e2..175b827bda8ca 100644
--- a/python/python-whisper/python-whisper.SlackBuild
+++ b/python/python-whisper/python-whisper.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$SRCVER
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
 cd $SRCNAM-$SRCVER
 chown -R root:root .
 find -L . \
diff --git a/python/python3-defusedxml/python3-defusedxml.SlackBuild b/python/python3-defusedxml/python3-defusedxml.SlackBuild
index b2f87eb682ba4..a5bdd82b6ff70 100644
--- a/python/python3-defusedxml/python3-defusedxml.SlackBuild
+++ b/python/python3-defusedxml/python3-defusedxml.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$REV
-tar xvf $CWD/v$VERSION.tar.bz2
+tar xvf $CWD/v$VERSION.tar.bz2 || tar xvf $CWD/$SRCNAM-$REV.tar.bz2
 cd $SRCNAM-$REV
 chown -R root:root .
 find -L . \
diff --git a/python/python3-dugong/python3-dugong.SlackBuild b/python/python3-dugong/python3-dugong.SlackBuild
index f743d393b508b..08603f2ff2fd4 100644
--- a/python/python3-dugong/python3-dugong.SlackBuild
+++ b/python/python3-dugong/python3-dugong.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$REV
-tar xvf $CWD/release-$VERSION.tar.bz2
+tar xvf $CWD/release-$VERSION.tar.bz2 || tar xvf $CWD/$SRCNAM-$REV.tar.bz2
 cd $SRCNAM-$REV
 chown -R root:root .
 find -L . \