From 12f717265c28560550b86c3b515ab0ca1e7bf376 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 14 Apr 2020 14:48:36 +0000
Subject: [PATCH] kiss: Fix removal bug. Closes #131

---
 kiss | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kiss b/kiss
index 16cc982..70d2074 100755
--- a/kiss
+++ b/kiss
@@ -881,10 +881,11 @@ pkg_remove() {
         # manager from removing user edited configuration files.
         [ "${file##/etc/*}" ] || continue
 
-        # Lazy removal. Try remove as a directory first before
-        # falling back to a file removal. Removes all files and
-        # only directories if empty.
-        rmdir "$KISS_ROOT/$file" || rm -f "$KISS_ROOT/$file" ||:
+        if [ -d "$KISS_ROOT/$file" ]; then
+            rmdir "$KISS_ROOT/$file" 2>/dev/null || continue
+        else
+            rm -f "$KISS_ROOT/$file"
+        fi
     done < "$sys_db/$1/manifest" 2>/dev/null
 
     # Reset 'trap' to its original value. Removal is done so