mirror of
https://github.com/rworkman/slackpkg
synced 2025-02-02 07:57:52 +01:00
Further fixup/enhancement to blacklisting issues
This commit is contained in:
parent
0635933b1e
commit
9c2719ff0f
2 changed files with 3 additions and 16 deletions
|
@ -1286,11 +1286,6 @@ Remove or blacklist the affected packages in order for slackpkg to work properly
|
|||
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() {
|
||||
local i
|
||||
|
||||
|
|
|
@ -476,17 +476,9 @@ case "$CMD" in
|
|||
fi
|
||||
;;
|
||||
blacklist)
|
||||
#
|
||||
# If blacklist is called without package name, list
|
||||
# all blacklisted packages
|
||||
if [ "$INPUTLIST" = "" ]; then
|
||||
echo -e "Packages in blacklist:\n"
|
||||
grep -v "^#" $CONF/blacklist | $MORECMD
|
||||
cleanup
|
||||
fi
|
||||
|
||||
# As of 15.0, this function just runs /bin/false and exits with a comment
|
||||
blacklist_pkg
|
||||
echo -e "Edit /etc/slackpkg/blacklist to add or remove packages."
|
||||
echo -e "Packages in blacklist:\n"
|
||||
grep -v "^#" $CONF/blacklist | $MORECMD
|
||||
;;
|
||||
file-search)
|
||||
PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g')
|
||||
|
|
Loading…
Add table
Reference in a new issue