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

FossilOrigin-Name: 8401c0afe22ccc31d27d37c1f4477d6b38024f634ff0621dd80e4bd8bf85f7fb

1 files changed, 5 insertions, 2 deletions

diff --git a/kiss b/kiss
index e4c4a3f..f21eb02 100755
--- a/kiss
+++ b/kiss
@@ -322,15 +322,18 @@ pkg_junk() (
     # built packages. This default assumes a prefix of '/usr' though the
     # 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=$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:usr/share/zsh/site-functions:usr/share/zsh/vendor-completions
 
     # Split the environment variable on ':' and turn it into an argument
     # 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
-    { 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.
     for junk; do