From 59917f1dc5795f670f087cd17eea2a2d2860b8f9 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Thu, 13 May 2021 22:56:56 +0200 Subject: [PATCH] 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 | 7 +++++++ src/ChangeLog.txt | 7 +++++++ src/slackpkgplus.sh | 10 +++++----- src/slackpkgplus.x86.sample | 1 + src/slackpkgplus.x86_64.sample | 1 + src/zlookkernel.sh | 8 ++++---- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5d15ebf..41c98b0 100644 --- a/ChangeLog.txt +++ b/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 diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 5d15ebf..41c98b0 100644 --- a/src/ChangeLog.txt +++ b/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 diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 43274dd..7a62daf 100755 --- a/src/slackpkgplus.sh +++ b/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 diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 9c93cf8..4fff4d9 100644 --- a/src/slackpkgplus.x86.sample +++ b/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 diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 11d6f16..541a682 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/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 diff --git a/src/zlookkernel.sh b/src/zlookkernel.sh index 351192b..d9826cb 100755 --- a/src/zlookkernel.sh +++ b/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."