diff options
Diffstat (limited to 'source/a/pkgtools')
-rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/installpkg | 4 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/removepkg | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index c92be7f40..d37ca0762 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-33} +BUILD=${BUILD:-34} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index f19cf59c0..ddd8e693b 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -677,9 +677,9 @@ EOF # rather than spawning subshells which is slow on ARM. This will also speed up # install script processing on any platform. if [ -x /bin/bash ]; then - cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' $INSTDIR/doinst.sh | /bin/bash + ( cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' $INSTDIR/doinst.sh | /bin/bash ) else - cd $ROOT/ ; sh $INSTDIR/doinst.sh + ( cd $ROOT/ ; sh $INSTDIR/doinst.sh ) fi else # use locking # If bash is available, use sed to convert the install script to use pushd/popd diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg index 5a1c7dcdd..ec9b4299a 100644 --- a/source/a/pkgtools/scripts/removepkg +++ b/source/a/pkgtools/scripts/removepkg @@ -411,7 +411,7 @@ remove_packages() { fi # If there is an uninstall script, run it here: if [ -r $TMP/$PKGNAME ]; then - cd $ROOT/ ; sh $TMP/$PKGNAME + ( cd $ROOT/ ; sh $TMP/$PKGNAME ) # Move the uninstall script to $LOG_DIR/removed_uninstall_scripts: mv $TMP/$PKGNAME $LOG_DIR/removed_uninstall_scripts fi |