Thu May 13 22:37:45 CEST 2021

pkg/slackpkg+-1.7.6-noarch-2mt.txz: Rebuilt
  - link instead copy for local repositories (thanks to zdolar)
  - WGETOPTS="-q" works with links too (use it with USETERSE=on)
  - zlookkernel did not honor PLUGIN_ZLOOKKERNEL_PROMPT=off correctly

ChangeLog.txt

@@ -1,3 +1,10 @@
+Thu May 13 22:37:45 CEST 2021
+pkg/slackpkg+-1.7.6-noarch-2mt.txz: Rebuilt
+  - link instead copy for local repositories (thanks to zdolar)
+  - WGETOPTS="-q" works with links too (use it with USETERSE=on)
+  - zlookkernel did not honor PLUGIN_ZLOOKKERNEL_PROMPT=off correctly
++-------------------------+
+
 Wed May 12 00:02:47 CEST 2021
 pkg/slackpkg+-1.7.6-noarch-1mt.txz: Upgrade
   - Added LEGACYBL to allow slackpkg+ to use the previous blacklist system

src/ChangeLog.txt

@@ -1,3 +1,10 @@
+Thu May 13 22:37:45 CEST 2021
+pkg/slackpkg+-1.7.6-noarch-2mt.txz: Rebuilt
+  - link instead copy for local repositories (thanks to zdolar)
+  - WGETOPTS="-q" works with links too (use it with USETERSE=on)
+  - zlookkernel did not honor PLUGIN_ZLOOKKERNEL_PROMPT=off correctly
++-------------------------+
+
 Wed May 12 00:02:47 CEST 2021
 pkg/slackpkg+-1.7.6-noarch-1mt.txz: Upgrade
   - Added LEGACYBL to allow slackpkg+ to use the previous blacklist system

src/slackpkgplus.sh

@@ -561,7 +561,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     if echo $URLFILE | grep -q "^file://" ; then
       URLFILE=${URLFILE:6}
       if [ -f $URLFILE ];then
-        echo -e "\tLinking $URLFILE"
+        [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
         ln -s $URLFILE $2
       else
         echo -e "\tNot found $URLFILE"
@@ -623,7 +623,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         echo -n "SLACKPKGPLUS_$PREPO[MD5] " >> ${TMPDIR}/CHECKSUMS.md5.asc
         if echo $URLFILE | grep -q "^file://" ; then
           URLFILE=${URLFILE:6}
-          echo -e "\tLinking $URLFILE"
+          [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
           ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc
           md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc|awk '{print $1}' >> ${TMPDIR}/CHECKSUMS.md5.asc
           continue
@@ -691,7 +691,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
 
           if echo $URLFILE | grep -q "^file://" ; then
             URLFILE=${URLFILE:6}
-            echo -e "\tLinking $URLFILE"
+            [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
             ln -s $URLFILE ${TMPDIR}/$CLOGNAM
           else
             if [ $VERBOSE -gt 2 ];then
@@ -731,7 +731,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
         if echo $URLFILE | grep -q "^file://" ; then
           URLFILE=${URLFILE:6}
-          echo -e "\tLinking $URLFILE"
+          [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
           ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO
         elif echo $URLFILE | grep -q "^dir:/" ; then
           touch ${TMPDIR}/CHECKSUMS.md5-$PREPO
@@ -817,7 +817,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
         if echo $URLFILE | grep -q "^file://" ; then
           URLFILE=${URLFILE:6}
-          echo -e "\tLinking $URLFILE"
+          [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
           ln -s $URLFILE $2-tmp-$PREPO
         elif echo $URLFILE |grep -q "dir:/";then
           continue

src/slackpkgplus.x86.sample

@@ -37,6 +37,7 @@ LEGACYBL=off
 
 # Add custom option to 'wget'.
 # You can solve the repository indisponibility issue by set a timeout here
+# Also add "-q" for super terse output (useful with USETERSE=on)
 WGETOPTS="--timeout=20 --tries=2"
 
 # If you want replace wget with another downloader search DOWNLOADCMD in documentation

src/slackpkgplus.x86_64.sample

@@ -45,6 +45,7 @@ LEGACYBL=off
 
 # Add custom option to 'wget'.
 # You can solve the repository indisponibility issue by set a timeout here
+# Also add "-q" for super terse output (useful with USETERSE=on)
 WGETOPTS="--timeout=20 --tries=2"
 
 # If you want replace wget with another downloader search DOWNLOADCMD in documentation

src/zlookkernel.sh

@@ -70,7 +70,7 @@ lookkernel() {
   if [ "$ORIKERNELMD5" != "$NEWKERNELMD5" ]; then
     KERNEL=$(readlink $PLUGIN_ZLOOKKERNEL_IMAGE | sed 's/.*-\([1-9]\)/\1/')
     echo -e "\nYour kernel image was updated (found $KERNEL). You have to rebuild the bootloader.\nDo you want slackpkg to do it? (Y/n)"
-    answer
+    [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
     if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
       INITRD=/boot/initrd.gz
       if [ -e /boot/initrd-tree/command_line ];then
@@ -82,7 +82,7 @@ lookkernel() {
           MKINITRD=$(sed -e "s/ *-k *[^ ]\+//g" -e "s/ *$/ -k $KERNEL/" /boot/initrd-tree/command_line)
           echo "  $MKINITRD"
           echo "Do you want continue? (Y/n)"
-          [ "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
+          [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
           if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
             $MKINITRD
             if [ ! -d "/boot/initrd-tree/lib/modules/$KERNEL" ];then
@@ -100,7 +100,7 @@ lookkernel() {
         for tocopy in vmlinuz vmlinuz-generic vmlinuz-huge `basename $PLUGIN_ZLOOKKERNEL_IMAGE` `basename $INITRD`;do
           if [ -e /boot/$tocopy ]&&[ -e /boot/efi/EFI/Slackware/$tocopy ]&&grep -E -q "= *$tocopy *$" /boot/efi/EFI/Slackware/elilo.conf ;then
             echo "Do you want to copy $tocopy to EFI partition? (Y/n)"
-            [ "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
+            [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
             if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
               cp -v /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy && COPYDONE="$COPYDONE $tocopy"
               touch -r /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy
@@ -113,7 +113,7 @@ lookkernel() {
         fi
       elif [ -x /sbin/lilo ]&&[ -e /etc/lilo.conf ]; then
         echo -e "\nFound lilo. Do you want to run now: /sbin/lilo ? (Y/n)"
-        [ "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
+        [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
         if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
           if ! /sbin/lilo -t ;then
             echo "You need to fix your lilo configuration NOW. Then press return to continue."