Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-26 09:58:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Blacklist method work as slackpkg

Browse source
This commit is contained in:
Matteo Rossini 2021-05-01 00:09:47 +02:00
parent b8f76c4d9f
commit 4b93460ae1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/slackpkgplus.sh
View file

@ -1139,13 +1139,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
SEARCHSTR=$@
grep -vE "(^#|^[[:blank:]]*$)" ${CONF}/blacklist > ${TMPDIR}/blacklist
if echo $CMD | grep -q install ; then
( cd $ROOT/ ; ls -1 ./var/log/packages/* ) | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
else
( cd $ROOT/ ; ls -1 ./var/log/packages/* ) | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist
fi
cat ${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist
printf "%s\n" $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
sed -i 's/^^/:/' $TMPDIR/blacklist
cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist
touch ${TMPDIR}/waiting
echo -n "Looking for $PATTERN in package list. Please wait... "
@ -1265,7 +1261,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
rm ${TMPDIR}/waiting
rm -f $PKGLIST $PKGINFOS
LIST=$(echo -e $LIST | tr \ "\n" | uniq )
LIST=$( printf "%s\n" $LIST | applyblacklist | sort | uniq )
echo -e "DONE\n"
} # END function searchPackages()
@ -1986,6 +1982,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi
done
if [ -e $TMPDIR/blacklist ];then
sed -i 's/^/^/' $TMPDIR/blacklist
fi
touch ${TMPDIR}/priority.filters
if [[ "$CMD" == "upgrade" || "$CMD" == "upgrade-all" ]] && [ "$ALLOW32BIT" == "on" ] ; then