5 files changed, 21 insertions, 24 deletions
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 46971acd0..b462b8396 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,14 @@
+
+Tue Apr 13 06:48:40 UTC 2021
+---------------
+	- Fix break error messages (dive)
+	- Remove now pointless if/then/else (dive)
+	- Safer config sourcing (dive)
+	- files/slackpkg: replace #!/bin/sh with #!/bin/bash (Eugen Wissner)
+	- Don't create blacklist when running update (dive)
+	- Add show-changelog & help to non-root commands (dive)
+	- Improve search blacklisting (dive)
+
 Sun Mar 14 15:17:21 UTC 2021
 ---------------
 	- Re-release slackpkg-15.0.1 (no package generated yet anyway)
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 9591d652a..2dc7f0504 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -163,7 +163,7 @@ function system_setup() {
 
 	# Create initial blacklist of single package names from regexps in
 	# ${CONF}/blacklist.
-	mkregex_blacklist
+	[ "$CMD" != update ] && mkregex_blacklist
 
 	SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv)
 	CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5
@@ -327,6 +327,8 @@ to the closest mirror and is very slow.\n"
 	   [ "$CMD" != "search" ] && \
 	   [ "$CMD" != "file-search" ] && \
 	   [ "$CMD" != "check-updates" ] && \
+	   [ "$CMD" != "show-changelog" ] && \
+	   [ "$CMD" != "help" ] && \
 	   [ "$CMD" != "info" ]; then
 		echo -e "\n\
 Only root can install, upgrade, or remove packages.\n\
@@ -629,13 +631,9 @@ function makelist() {
 
 	INPUTLIST=$@
 
-	if echo $CMD | grep -q install ; then
-		ls -1 $ROOT/var/log/packages/* |
-			awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
-	else
-		ls -1 $ROOT/var/log/packages/* |
-			awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
-	fi
+	printf "%s\n" $ROOT/var/log/packages/* |
+		awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
+
 	cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist
 
 	touch ${TMPDIR}/waiting
@@ -784,9 +782,6 @@ function makelist() {
 			else
 				for i in ${PRIORITY[@]}; do
 
-					# Test for search pattern in blacklist first
-					grep -q "^${PATTERN}$" ${TMPDIR}/blacklist && continue
-
 					PKGS=$( cut -d\  -f1-7 ${TMPDIR}/pkglist |
 						grep "^${i}.*${PATTERN}" | cut -f6 -d\ )
 
@@ -800,14 +795,9 @@ function makelist() {
 				done
 			fi
 			rm -f $PKGNAMELIST
-			rm ${TMPDIR}/waiting
-
-			echo -e "DONE\n"
-			# We need to return early before the blacklist
-			return
 		;;	
 	esac
-	LIST=$( printf "%s\n" $LIST | applyblacklist | uniq )
+	LIST=$( printf "%s\n" $LIST | applyblacklist | sort | uniq )
 
 	rm ${TMPDIR}/waiting
 
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index a9f86f80e..9191766a0 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -242,19 +242,16 @@ EOF
 		answer
 		case $ANSWER in
 			K|k)
-				break
 			;;
 			O|o)
 				for i in $FILES; do
 					overold $i
 				done
-				break
 			;;
 			R|r)
 				for i in $FILES; do
 					removeold $i
 				done
-				break
 			;;
 			P|p)
 				echo "Select what you want file-by-file"
@@ -288,7 +285,6 @@ EOF
 						esac
 					done
 				done
-				break
 			;;
 			*)
 				echo "
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 2553191dc..1076ba330 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # SlackPkg - An Automated packaging tool for Slackware Linux
 # Copyright (C) 2003-2011 Roberto F. Batista, Evaldo Gardenali
@@ -70,7 +70,7 @@ SOURCE=$(sed -n '
 	\@^local://@p
 	\@^https\{0,1\}://@p
 	\@^ftps\{0,1\}://@p' $CONF/mirrors)
-. $CONF/slackpkg.conf
+PATH='' builtin source $CONF/slackpkg.conf
 WORKDIR=${ROOT}/${WORKDIR}
 ERROR=""
 
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 788eb52d4..cff9f572d 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=slackpkg
-VERSION=${VERSION:-15.0.1}
+VERSION=${VERSION:-15.0.2}
 ARCH="noarch"
 BUILD=${BUILD:-1}