From 57e8f4946243ceddb339521e08e208464cfc6726 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Tue, 19 Jan 2016 23:38:21 +0000 Subject: Multiple: Support alternate tarball name. Signed-off-by: David Spencer --- system/blocks/blocks.SlackBuild | 6 +++--- system/gitolite/gitolite.SlackBuild | 2 +- system/ktsuss/ktsuss.SlackBuild | 2 +- system/multibootusb/multibootusb.SlackBuild | 2 +- system/physlock/physlock.SlackBuild | 2 +- system/reptyr/reptyr.SlackBuild | 6 +++--- system/scanmem/scanmem.SlackBuild | 2 +- system/tinyvm/tinyvm.SlackBuild | 2 +- system/uptimed/uptimed.SlackBuild | 2 +- system/z/z.SlackBuild | 2 +- system/zopfli/zopfli.SlackBuild | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'system') diff --git a/system/blocks/blocks.SlackBuild b/system/blocks/blocks.SlackBuild index ebff0f1b02..cfbdb7ce9d 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 379f2091f9..c0e62f96d2 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 2213f6220e..ddd170f8ad 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 1c438447fc..58f9259d55 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 0e4f734e28..a5084e762d 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 f42da43ba2..64e746f73d 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 941c6f9856..16a7003b99 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 37eb9234f5..004f487c6a 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 bc9384b204..5319ecf835 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 44e1fbca32..e531f29576 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 bf1b4974a5..a4cc1a214e 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 . \ -- cgit v1.2.3