Fri Apr 23 19:13:09 UTC 202120210423191309

a/pkgtools-15.0-noarch-39.txz:  Rebuilt.
  upgradepkg: revert change where $ROOT/sbin/installpkg is called instead of
  /sbin/installpkg. Conceptually, this seemed like a nice change (but would
  have also required removepkg to be called the same way), but it seems to
  break an established expectation that the pkgtools can be used without them
  actually being installed in $ROOT. Thanks to alienBOB.
a/sysvinit-scripts-15.0-noarch-2.txz:  Rebuilt.
  Use #!/bin/bash for these scripts so that bashisms don't cause script issues
  if /bin/sh is some other shell. Thanks to mumahendras3.
  rc.S: Use GazL's proposals for detecting/mounting /proc and /sys.
d/parallel-20210422-noarch-1.txz:  Upgraded.
l/glib-networking-2.68.1-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.29-x86_64-1.txz:  Upgraded.
x/igt-gpu-tools-1.26-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
  Rebuild with pkgtools-15.0-noarch-39.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Rebuild with pkgtools-15.0-noarch-39.

3 files changed, 13 insertions, 13 deletions

diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index aac185ee3..0c7d43f08 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:-38}
+BUILD=${BUILD:-39}
 
 # 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 3bebe7ce2..3bebe7ce2 100755..100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index 62d05440f..d71ca4b03 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
-          $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+          /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
         elif [ $INFOBOX ]; then
-          $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+          /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
         elif [ $TERSE ]; then
-          OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+          OUTPUTLINE="$(/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
-          $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
+          /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
-      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
+      /sbin/installpkg $INCOMINGDIR/$NNAME
       RETCODE=$?
     else
-      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+      /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
       RETCODE=$?
     fi
   else
     if [ $PLAINTERSE ]; then
-      $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+      /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
     elif [ $INFOBOX ]; then
-      $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+      /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
     elif [ $TERSE ]; then
-      OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+      OUTPUTLINE="$(/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..."
-      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+      /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
-      $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
+      /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
     else
-      $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
+      /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
     fi
   fi
   ! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME."