From f9909596f03d17002f2444082169767e5c595fa1 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Wed, 26 Jun 2019 18:21:42 +0000 Subject: kiss: clean up FossilOrigin-Name: 81dc120a72a2df5954c74e04d112b5339e10971773a44dd01b921379c8dde8f9 --- kiss | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kiss b/kiss index 7580078..7e38f14 100755 --- a/kiss +++ b/kiss @@ -199,12 +199,10 @@ pkg_install() { find ./ -mindepth 1 -not -type d | while read -r file; do rpath=${file#.} - case $rpath in - /etc/*) [ -f "$sys_dir${rpath%/*}/${file##*/}" ] || mv=1 ;; - *) mv=1 ;; - esac + [ -z "${rpath##/etc/*}" ] && [ -f "$sys_dir${rpath%/*}/${file##*/}" ] && + return - [ "$mv" ] && mv "$file" "$sys_dir${rpath%/*}" ;mv= + mv "$file" "$sys_dir${rpath%/*}" done "$sys_db/$name/post-install" 2>/dev/null @@ -233,7 +231,7 @@ pkg_remove() { # Use the backup of 'rm' to remove 'rmdir' and itself. "$cac_dir/rm" "$cac_dir/rmdir" "$cac_dir/rm" - log "Removed ${1:-name}." + log "Removed ${1:-$name}." } pkg_updates() { -- cgit v1.2.3