From 40dccabfc99eec9f7b47874c796ee34e9b8552f9 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Mon, 18 Apr 2022 18:21:52 +0200 Subject: [PATCH] Mon Apr 18 18:19:11 CEST 2022 pkg/slackpkg+-1.8.0-noarch-4mt.txz: Upgrade - Show filename in wget2 instead directory --- ChangeLog.txt | 5 +++++ src/ChangeLog.txt | 5 +++++ src/slackpkgplus.sh | 12 ++++++++++++ 3 files changed, 22 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 48e30ad..df50821 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Mon Apr 18 18:19:11 CEST 2022 +pkg/slackpkg+-1.8.0-noarch-4mt.txz: Upgrade + - Show filename in wget2 instead directory ++-------------------------+ + Sun Apr 3 19:29:38 CEST 2022 pkg/slackpkg+-1.8.0-noarch-3mt.txz: Upgrade - Manage '+' in $TEMP path diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 48e30ad..df50821 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,8 @@ +Mon Apr 18 18:19:11 CEST 2022 +pkg/slackpkg+-1.8.0-noarch-4mt.txz: Upgrade + - Show filename in wget2 instead directory ++-------------------------+ + Sun Apr 3 19:29:38 CEST 2022 pkg/slackpkg+-1.8.0-noarch-3mt.txz: Upgrade - Manage '+' in $TEMP path diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 65b3003..6b25b40 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -446,6 +446,18 @@ if [ "$SLACKPKGPLUS" = "on" ];then ##### ====== DOWNLOADERS ====== ###### + # Resolve some issue with wget2 + # + function wget2(){ + WGET2CMD="$@" + 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 + ) + } # Implements an improved wget version for a verbose output # function wgetdebug(){