Miroirs/slackpkg
1
0
Fork 0
mirror of https://github.com/rworkman/slackpkg synced 2025-02-08 08:46:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move applyblacklist to end of makelist()

Browse source 
Change -E to -F in applyblacklist()
Remove '>' prompt in answer()
This commit is contained in:
Dave Woodfall 2021-02-24 23:14:18 +00:00
parent 19c9fc0d9b
commit a96e181033
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
files/core-functions.sh
View file

@ -618,7 +618,7 @@ function mkregex_blacklist() {
# Blacklist filter # Blacklist filter
# #
function applyblacklist() { function applyblacklist() {
grep -vE -f ${TMPDIR}/blacklist grep -vF -f ${TMPDIR}/blacklist
} }
# Function to make install/reinstall/upgrade lists # Function to make install/reinstall/upgrade lists
@ -635,10 +635,9 @@ function makelist() {
awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
else else
ls -1 $ROOT/var/log/packages/* | ls -1 $ROOT/var/log/packages/* |
awk -f /usr/libexec/slackpkg/pkglist.awk | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
applyblacklist > ${TMPDIR}/tmplist
fi fi
cat ${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist
touch ${TMPDIR}/waiting touch ${TMPDIR}/waiting
@ -799,7 +798,7 @@ function makelist() {
rm -f $PKGNAMELIST rm -f $PKGNAMELIST
;; ;;
esac esac
LIST=$(echo -e $LIST | tr \ "\n" | uniq ) LIST=$( printf "%s\n" $LIST | applyblacklist | sort -u )
rm ${TMPDIR}/waiting rm ${TMPDIR}/waiting
@ -821,7 +820,7 @@ function answer() {
ANSWER="$DEFAULT_ANSWER" ANSWER="$DEFAULT_ANSWER"
echo $DEFAULT_ANSWER echo $DEFAULT_ANSWER
else else
read -p "> " ANSWER read ANSWER
fi fi
} }