From 6726b32cc78615f86f1c92eafd38f9f21a5e8351 Mon Sep 17 00:00:00 2001 From: Slack Coder Date: Thu, 4 Apr 2024 17:57:25 -0500 Subject: Make slackpkg checks more reliable Properly handle slackpkg exit codes on updates. --- src/recipes/use-current-kernel.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/recipes/use-current-kernel.sh') diff --git a/src/recipes/use-current-kernel.sh b/src/recipes/use-current-kernel.sh index 8c41569..50b08e7 100644 --- a/src/recipes/use-current-kernel.sh +++ b/src/recipes/use-current-kernel.sh @@ -46,12 +46,15 @@ mv /etc/slackpkg/blacklist /etc/slackpkg/blacklist.orig touch /etc/slackpkg/blacklist D="mv -f /etc/slackpkg/blacklist.orig /etc/slackpkg/blacklist; $D"; trap "$D" EXIT -slackpkg -batch=on -default_answer=n \ - upgrade kernel \ - | grep "\.t.z$" \ - | tee "$PACKAGE_UPDATES" \ - || exit "$?" +OUTPUT="$(slackpkg -batch=on -default_answer=n upgrade kernel)" || exit_code="$?" +if [ $exit_code -ne 0 ] && [ $exit_code -ne 20 ] && [ $exit_code -ne 100 ]; then + # slackpkg has several safe exit codes. + exit exit_code +fi +echo "$OUTPUT" \ + | grep "\.t.z$" \ + | tee "$PACKAGE_UPDATES" if [ ! -s "$PACKAGE_UPDATES" ]; then # No updates exit 0 -- cgit v1.2.3