summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--files/core-functions.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/files/core-functions.sh b/files/core-functions.sh
index dcb43db..5370b3a 100644
--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -609,13 +609,14 @@ function mkregex_blacklist() {
# Filter server and local package lists through blacklist
( cat ${WORKDIR}/pkglist
printf "%s\n" $ROOT/var/log/packages/* |
- awk -f $ROOT/usr/libexec/slackpkg/pkglist.awk
+ awk -f /usr/libexec/slackpkg/pkglist.awk
) | grep -E -f ${TMPDIR}/blacklist.tmp |
- awk '{print " "$2" "}' | sed -E "s,[+],\\\+,g" |
+ awk '{print $2}' | sed -E "s,[+],\\\+,g" |
sort -u > ${TMPDIR}/blacklist
}
# Blacklist filter
+#
function applyblacklist() {
grep -vE -f ${TMPDIR}/blacklist
}
@@ -1248,7 +1249,7 @@ function sanity_check() {
if [ "$FILES" != "" ]; then
for i in $FILES ; do
- echo "${i}" | applyblacklist 1> /dev/null || continue
+ echo "${i}" | grep -qE -f ${TMPDIR}/blacklist && continue
DOUBLEFILES="$DOUBLEFILES $i"
done
unset FILES