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

Further fixup/enhancement to blacklisting issues

Browse source
This commit is contained in:
Robby Workman 2021-02-11 19:03:30 -06:00
parent 0635933b1e
commit 9c2719ff0f
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
files/core-functions.sh
View file

@ -1286,11 +1286,6 @@ Remove or blacklist the affected packages in order for slackpkg to work properly
fi fi
} }
function blacklist_pkg() {
echo -e "\nThis function no longer adds packages to your blacklist.\n\
As of slackpkg 15.0, you will need to edit ${CONF}/blacklist instead.\n"
}
function remove_pkg() { function remove_pkg() {
local i local i

10
files/slackpkg
View file

@ -476,17 +476,9 @@ case "$CMD" in
fi fi
;; ;;
blacklist) blacklist)
# echo -e "Edit /etc/slackpkg/blacklist to add or remove packages."
# If blacklist is called without package name, list
# all blacklisted packages
if [ "$INPUTLIST" = "" ]; then
echo -e "Packages in blacklist:\n" echo -e "Packages in blacklist:\n"
grep -v "^#" $CONF/blacklist | $MORECMD grep -v "^#" $CONF/blacklist | $MORECMD
cleanup
fi
# As of 15.0, this function just runs /bin/false and exits with a comment
blacklist_pkg
;; ;;
file-search) file-search)
PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g') PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g')