summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--files/ChangeLog1
-rw-r--r--files/core-functions.sh2
-rw-r--r--files/slackpkg1
-rwxr-xr-xslackpkg.SlackBuild2
4 files changed, 4 insertions, 2 deletions
diff --git a/files/ChangeLog b/files/ChangeLog
index 0c0354a..1a4ae3f 100644
--- a/files/ChangeLog
+++ b/files/ChangeLog
@@ -1,5 +1,6 @@
---------------
+ - Fix exit code for pending updates (dive)
- Avoid matching txz/tgz etc extension when blacklisting (dive)
- Use https for all slackpkg homepage links
- Update mirror files (14.2 -> 15.0)
diff --git a/files/core-functions.sh b/files/core-functions.sh
index db7cd5d..85ceb2c 100644
--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -7,7 +7,7 @@
# Clean-up tmp and lock files
#
function cleanup() {
- local retval=0
+ local retval=${PENDING_UPDATES:-0}
[ "$SPINNING" = "off" ] || tput cnorm
if [ -e $TMPDIR/error.log ]; then
retval=1
diff --git a/files/slackpkg b/files/slackpkg
index 51c8572..746a8c5 100644
--- a/files/slackpkg
+++ b/files/slackpkg
@@ -332,6 +332,7 @@ case "$CMD" in
echo "Slackpkg: No updated packages since last check."
else
echo "Slackpkg: Updated packages are available since last check." >&2
+ PENDING_UPDATES=1
fi
;;
show-changelog)
diff --git a/slackpkg.SlackBuild b/slackpkg.SlackBuild
index e410e48..6f9aaa6 100755
--- a/slackpkg.SlackBuild
+++ b/slackpkg.SlackBuild
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=slackpkg
-VERSION=${VERSION:-15.0.1}
+VERSION=${VERSION:-15.0.1_beta1}
ARCH="noarch"
BUILD=${BUILD:-1}