diff options
Diffstat (limited to 'source/a/pkgtools')
| -rw-r--r-- | source/a/pkgtools/manpages/pkgtool.8 | 2 | ||||
| -rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/pkgtools/scripts/upgradepkg | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/source/a/pkgtools/manpages/pkgtool.8 b/source/a/pkgtools/manpages/pkgtool.8 index 56e392176..0faf56013 100644 --- a/source/a/pkgtools/manpages/pkgtool.8 +++ b/source/a/pkgtools/manpages/pkgtool.8 @@ -52,7 +52,7 @@ is run during the initial system installation. Feel free to try them, but be careful. .TP .B \--sets #A#B#C# -Install the disk sets A, B, C. Seperate the disk set names by '#' symbols. +Install the disk sets A, B, C. Separate the disk set names by '#' symbols. .TP .B \--source_mounted When this flag is present, diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index cca59234c..aac185ee3 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:-37} +BUILD=${BUILD:-38} # 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/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index d71ca4b03..62d05440f 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -262,11 +262,11 @@ for ARG; do echo "$NEW would be installed (new package)." else if [ $PLAINTERSE ]; then - /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME elif [ $INFOBOX ]; then - /sbin/installpkg --infobox $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME elif [ $TERSE ]; then - OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)" + OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)" ( flock 9 || exit 11 echo "Installing: ${OUTPUTLINE}" ) 9> $INSTLOCKDIR/outputline.lock @@ -278,7 +278,7 @@ for ARG; do +============================================================================== EOF - /sbin/installpkg $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME fi fi fi @@ -356,26 +356,26 @@ EOF # Next, the new package is pre-installed: if [ "$VERBOSE" = "verbose" ]; then if ! [ $TERSE ]; then - /sbin/installpkg $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME RETCODE=$? else - /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null + $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null RETCODE=$? fi else if [ $PLAINTERSE ]; then - /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME elif [ $INFOBOX ]; then - /sbin/installpkg --infobox $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME elif [ $TERSE ]; then - OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)" + OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)" RETCODE=$? ( flock 9 || exit 11 echo "Upgrading: ${OUTPUTLINE}" ) 9> $INSTLOCKDIR/outputline.lock else echo "Pre-installing package $NEW..." - /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null + $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null RETCODE=$? fi fi @@ -406,9 +406,9 @@ EOF # shift location, so we should always reinstall as the final step: if [ ! "$NOT_PARANOID" = "true" ]; then if ! [ $TERSE ]; then - /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME + $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME else - /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null + $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null fi fi ! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME." |