From 07d964cd43c6c1aca2c9ca0dabfd8448bebf4700 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Fri, 13 Apr 2018 23:33:37 +0200 Subject: [PATCH] slackpkg upgrade did not work with slackpkg-2.83 (development release) --- src/slackpkgplus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 7ad148a..36f78ae 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -871,7 +871,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then AUTOP=no if [[ "$CMD" == "upgrade" || "$CMD" == "upgrade-all" ]];then ( cd $ROOT/var/log/packages - ls $ARGUMENT-*-*-* 2>/dev/null|sed 's/$/.txz/' | awk -f /usr/libexec/slackpkg/pkglist.awk|grep -q " $ARGUMENT " + ( cd $ROOT/ ; ls -1 ./var/log/packages/$ARGUMENT-*-*-* 2>/dev/null ) | awk -f /usr/libexec/slackpkg/pkglist.awk|grep -q " $ARGUMENT " )||return if [ ! -z "$AUTOPRIORITY" ];then if echo "$ARGUMENT"|grep -wq $AUTOPRIORITY;then @@ -888,7 +888,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then if [ "$AUTOP" == "on" ] ; then PKGINFOS=$( cd $ROOT/var/log/packages - ls $ARGUMENT-* 2>/dev/null |sed 's/$/.txz/' | awk -f /usr/libexec/slackpkg/pkglist.awk| + ( cd $ROOT/ ; ls -1 ./var/log/packages/$ARGUMENT-*-*-* 2>/dev/null ) | awk -f /usr/libexec/slackpkg/pkglist.awk| grep " $ARGUMENT "|awk '{print $1,$4}'| ( read X && ( echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1 /' -e 's/^/ /'