From 177588c71363a2269805bbe33d96793448996ec3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 11 Jun 2020 11:23:29 +0300 Subject: [PATCH] kiss: Drop special case. Alternatives / Hooks can handle this easily --- kiss | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/kiss b/kiss index ff8e022..b8f14d3 100755 --- a/kiss +++ b/kiss @@ -81,7 +81,8 @@ run_hook() { [ "${KISS_HOOK:-}" ] || { case $1 in post-build) rm -rf "$3/usr/share/gettext" "$3/usr/share/polkit-1" \ - "$3/usr/share/locale" "$3/usr/share/info" + "$3/usr/share/locale" "$3/usr/share/info" \ + "$3/usr/lib/charset.alias" esac return 0 @@ -630,12 +631,6 @@ pkg_build() { # database entry. cp -LRf "$repo_dir" "$pkg_dir/$pkg/$pkg_db/" - # We never ever want this. Let's end the endless conflicts and remove - # it. This will be the only exception for a specific removal of this - # kind. A 'find' is used instead of 'rm' so as to not hardcode the - # location to this file. - find "$pkg_dir/$pkg" -type f -name charset.alias -exec rm -f {} + - log "$pkg" "Successfully built package" run_hook post-build "$pkg" "$pkg_dir/$pkg"