From c1250b7d161ea036dbe9395c1366f9fd3a982e79 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Sat, 7 May 2022 01:23:31 +0200 Subject: [PATCH] Sat May 7 01:06:13 CEST 2022 pkg/slackpkg+-1.8.0-noarch-5mt.txz: Upgrade - wget2 does not honor WGETOPTS +-------------------------+ --- ChangeLog.txt | 5 +++++ src/ChangeLog.txt | 5 +++++ src/slackpkgplus.sh | 7 +++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index df50821..1ab22d2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Sat May 7 01:06:13 CEST 2022 +pkg/slackpkg+-1.8.0-noarch-5mt.txz: Upgrade + - wget2 does not honor WGETOPTS ++-------------------------+ + Mon Apr 18 18:19:11 CEST 2022 pkg/slackpkg+-1.8.0-noarch-4mt.txz: Upgrade - Show filename in wget2 instead directory diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index df50821..1ab22d2 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,8 @@ +Sat May 7 01:06:13 CEST 2022 +pkg/slackpkg+-1.8.0-noarch-5mt.txz: Upgrade + - wget2 does not honor WGETOPTS ++-------------------------+ + Mon Apr 18 18:19:11 CEST 2022 pkg/slackpkg+-1.8.0-noarch-4mt.txz: Upgrade - Show filename in wget2 instead directory diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 6b25b40..f888677 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -453,10 +453,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then WGET2PATH=$(echo "$WGET2CMD"|sed -r "s,.*-O ([^ ]+) .*,\1,") WGET2DIR=$(echo "$WGET2PATH"|sed -r "s,/[^/]*$,,") WGET2CMD="$(echo "$WGET2CMD"|sed -r "s,$WGET2DIR/,,")" - ( - cd $WGET2DIR - /usr/bin/wget2 $WGET2CMD - ) + cd $WGET2DIR + /usr/bin/wget2 $WGETOPTS $WGET2CMD + cd - } # Implements an improved wget version for a verbose output #