kiss: Always remove charset.alias to avoid KISS_RM issues.

This commit is contained in:
Dylan Araps 2019-10-15 11:54:16 +03:00
parent 66c363a3b8
commit a787ce2635
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E

7
kiss
View File

@ -322,15 +322,18 @@ pkg_junk() (
# built packages. This default assumes a prefix of '/usr' though the # built packages. This default assumes a prefix of '/usr' though the
# user can further configure it to search whatever paths they desire. # user can further configure it to search whatever paths they desire.
rm=usr/share/doc:usr/share/gtk-doc:usr/share/info:usr/share/polkit-1 rm=usr/share/doc:usr/share/gtk-doc:usr/share/info:usr/share/polkit-1
rm=$rm:usr/share/gettext:usr/share/locale:usr/lib/charset.alias rm=$rm:usr/share/gettext:usr/share/locale
rm=$rm:etc/bash_completion.d:usr/share/applications rm=$rm:etc/bash_completion.d:usr/share/applications
rm=$rm:usr/share/zsh/site-functions:usr/share/zsh/vendor-completions rm=$rm:usr/share/zsh/site-functions:usr/share/zsh/vendor-completions
# Split the environment variable on ':' and turn it into an argument # Split the environment variable on ':' and turn it into an argument
# list. This works exactly like '$KISS_PATH'. # list. This works exactly like '$KISS_PATH'.
# #
# Files which always conflict (such as usr/lib/charset.alias) and are
# uneeded should be removed regardless.
#
# shellcheck disable=2046,2086 # shellcheck disable=2046,2086
{ IFS=:; set -- ${KISS_RM-$rm}; IFS=$old_ifs; } { IFS=:; set -- ${KISS_RM-$rm:usr/lib/charset.alias}; IFS=$old_ifs; }
# Loop over each junk entry and delete it if it exists. # Loop over each junk entry and delete it if it exists.
for junk; do for junk; do