diff options
| author | Dave Woodfall <dave@slackbuilds.org> | 2021-02-20 04:19:23 +0000 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2021-02-20 23:51:30 -0600 |
| commit | 612b6553aea6e4ef714f2f8df2ff3d4de2a4a642 (patch) | |
| tree | 901be92f7bdf54444f0a814ae2f18c18c767bc0d | |
| parent | 7faebfbdb18bc8f01d14499af6579a43dbfbeac6 (diff) | |
| download | slackpkg-612b6553aea6e4ef714f2f8df2ff3d4de2a4a642.tar.xz | |
Reduce false positives in DOUBLEFILES detection
Add extra formatting for search/doublefiles
| -rw-r--r-- | files/core-functions.sh | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/files/core-functions.sh b/files/core-functions.sh index 5370b3a..3fecfb3 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -860,7 +860,14 @@ function searchlist() { echo "[${STATUS}] - ${INSTPKG}" else STATUS=" upgrade " - echo "[${STATUS}] - ${INSTPKG} --> ${RAWNAME}" + INSTPKG=$( printf "$INSTPKG" | tr '\n' ' ' ) + + if echo "$INSTPKG" | grep -q ' '; then + printf "%s - %s / %s\n --> %s\n" \ + "[${STATUS}]" ${INSTPKG} ${RAWNAME} + else + echo "[${STATUS}] - ${INSTPKG} --> ${RAWNAME}" + fi fi else echo "[${STATUS}] - ${RAWNAME}" @@ -1242,18 +1249,10 @@ function sanity_check() { mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME} done - ls -1 $ROOT/var/log/packages/ | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \ - 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 - echo "${i}" | grep -qE -f ${TMPDIR}/blacklist && continue - DOUBLEFILES="$DOUBLEFILES $i" - done - unset FILES - fi + DOUBLEFILES=$( ls -1 $ROOT/var/log/packages/ | + rev | cut -d- -f4- | rev | uniq -D | sort -u | applyblacklist | + xargs -I '{}' find $ROOT/var/log/packages/ -regex \ + ".*/{}-[^-]+-\($ARCH\|noarch\|fw\)-[^-]+" | xargs -I '{}' basename '{}' ) rm ${TMPDIR}/waiting echo -e "DONE" @@ -1264,10 +1263,8 @@ You have a broken $ROOT/var/log/packages/ - with two versions of the same packag The list of packages duplicated in your machine is shown below, but don't\n\ worry about this list - when you select your action, slackpkg will show a\n\ better list:\n" - for i in $DOUBLEFILES ; do - ls -1 $ROOT/var/log/packages/ |\ - egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-" - done + printf "%s\n" $DOUBLEFILES + echo -ne "\n\ You can (R)emove, or (I)gnore these packages.\n\ Select your action (R/I): " @@ -1275,17 +1272,12 @@ Select your action (R/I): " echo case "$ANSWER" in R|r) - for i in $DOUBLEFILES ; do - FILE=$(ls -1 $ROOT/var/log/packages/ |\ - egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-") - FILES="$FILES $FILE" - done - showlist "$FILES" remove + showlist "$DOUBLEFILES" remove remove_pkg ;; *) - echo -e "\n\ -Remove or blacklist the affected packages in order for slackpkg to work properly.\n" + echo "Remove or blacklist the affected packages in order for \ +slackpkg to work properly." cleanup ;; esac |