diff --git a/install.sh b/install.sh index 3dad9d25..7f65fabf 100755 --- a/install.sh +++ b/install.sh @@ -30,10 +30,8 @@ cat setup.cfg | grep "version =" | tr -d "[:space:]" | cut -c9-13 | tr , . PRGNAM=slpkg VERSION=${VERSION:-$(__version)} -# Installation script. -# With this script allows you to install the slpkg as a Slackware package binary file. -ARCHIVES="$PRGNAM-$VERSION.tar.gz $PRGNAM-$VERSION.zip v$VERSION.tar.gz v$VERSION.zip \ - $PRGNAM-$VERSION.tar.bz2" +ARCHIVES="$PRGNAM-$VERSION.tar.gz $PRGNAM-$VERSION.tar.bz2 $PRGNAM-$VERSION.zip" + cd .. for file in $ARCHIVES; do if [ -f $file ]; then diff --git a/slackbuild/slpkg.SlackBuild b/slackbuild/slpkg.SlackBuild index 46db3339..c0b56171 100755 --- a/slackbuild/slpkg.SlackBuild +++ b/slackbuild/slpkg.SlackBuild @@ -76,9 +76,7 @@ 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 \ - || tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || unzip $CWD/$PRGNAM-$VERSION.zip \ - || unzip $CWD/v$VERSION.zip +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || unzip $CWD/$PRGNAM-$VERSION.zip cd $PRGNAM-$VERSION chown -R root:root . find -L . \