From 8e7b8c212b90b11956478bd49cb2a3edd5d819f3 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Tue, 26 Oct 2021 16:17:55 +0200 Subject: [PATCH] - According to slackpkg 15.0.8 new exit codes was added in slackpkg+ too: 0 Successful Slackpkg execution. 1 Something wrong happened. 2 Something fatal happened. (not available in slackpkg) 20 No package found to be downloaded, installed, reinstalled, upgraded or removed. 50 Slackpkg itself was upgraded and you need to re-run it. 100 There are pending updates. Please: do not ignore the fatal output! --- src/slackpkgplus.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index e87a890..d6c5305 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -171,7 +171,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then # Get the current exit-code so that we can check if cleanup is # called in response of a CTRL+C (ie. $?=130) or not. local lEcode=$? - local retval=${PENDING_UPDATES:-0} + local retval=${EXIT_CODE:-0} + [ ! -z "$PENDING_UPDATES" ]&&retval=$PENDING_UPDATES if [ "$CMD" == "info" ];then DETAILED_INFO=${DETAILED_INFO:-none} @@ -1924,7 +1925,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then cleanup fi - SPKGPLUS_VERSION="1.7.8" + SPKGPLUS_VERSION="1.7.9" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" if [ ${VERSION:0:4} == "2.82" ];then @@ -2461,7 +2462,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then if $UPDATES ; then echo "Slackpkg: Updated packages are available since last check." >&2 - PENDING_UPDATES=1 + EXIT_CODE=100 printf "\n [ %-24s ] [ %-20s ]\n" "Repository" "Status"