diff options
| author | Dave Woodfall <dave@tty1.uk> | 2021-02-11 17:00:14 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2021-02-11 17:01:03 -0600 |
| commit | f87bf1bf682af0825aab802cefc7d9449bb48686 (patch) | |
| tree | a423225a6cad66c8f4e269947c9dc29e8458a9d1 | |
| parent | d9f835b61ad691fe7e777ed5267c4e598ee509cb (diff) | |
| download | slackpkg-f87bf1bf682af0825aab802cefc7d9449bb48686.tar.xz | |
Use ERE for sanity_check() function
Signed-off-by: Robby Workman <rworkman@slackware.com>
| -rw-r--r-- | files/core-functions.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/files/core-functions.sh b/files/core-functions.sh index 9816458..e29da44 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -1219,9 +1219,10 @@ function sanity_check() { batchcutpkg | sort > $TMPDIR/list1 cat $TMPDIR/list1 | uniq > $TMPDIR/list2 FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )" + if [ "$FILES" != "" ]; then for i in $FILES ; do - grep -qx "${i}" ${CONF}/blacklist && continue + echo "${i}" | grep -qE -f ${ROOT}/${CONF}/blacklist && continue DOUBLEFILES="$DOUBLEFILES $i" done unset FILES |