diff options
| author | Dave Woodfall <dave@slackbuilds.org> | 2021-02-20 04:14:57 +0000 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2021-02-20 23:49:50 -0600 |
| commit | 7faebfbdb18bc8f01d14499af6579a43dbfbeac6 (patch) | |
| tree | dbd3b3649ae7a2dc0e4abc6b1d4d2ae9809f3bf0 | |
| parent | 07df0b63045d1494bcf3b8403837a7c94d1cf590 (diff) | |
| download | slackpkg-7faebfbdb18bc8f01d14499af6579a43dbfbeac6.tar.xz | |
Remove spaces in awk.
| -rw-r--r-- | files/core-functions.sh | 7 |
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 |