cpt

[ARCHIVED] Carbs Packaging Tools
git clone git://git.ckyln.com/~cem/cpt.git
Log | Files | Refs | README | LICENSE

commit a787ce263516172d5414cc19a15c2f64773ae131
parent 66c363a3b8b26fb9fcd37b94ab7cf3b704f9fc05
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Tue, 15 Oct 2019 11:54:16 +0300

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

Diffstat:
Mkiss | 7+++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 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