From 8aef7115c664d679b5647fa135e674d09acf1fa8 Mon Sep 17 00:00:00 2001
From: emmett1 <emmett1.2miligrams@gmail.com>
Date: Sun, 26 May 2019 14:55:52 +0800
Subject: [PATCH] fix bugs: old dirs not removed when pkgdel and upgrade
 package

---
 pkgadd | 2 +-
 pkgdel | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgadd b/pkgadd
index 41d70f7..7f1c057 100755
--- a/pkgadd
+++ b/pkgadd
@@ -286,7 +286,7 @@ if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
 		rm "$ROOT_DIR/$line" &>/dev/null
 	done
 	grep '/$' $TMP_PKGADD_RMLIST | tac | while read line; do
-		if [ ! "$(grep -R --exclude-dir="$name" -w "$line" "$INDEX_DIR"/*/.files)" ]; then
+		if [ ! "$(grep -Rx "$line" "$INDEX_DIR"/*/.files | grep -v "$INDEX_DIR"/$name)" ]; then
 			[ "$VERBOSE_INSTALL" = yes ] && echo "- $line"
 			rmdir "$ROOT_DIR/$line" &>/dev/null
 		fi
diff --git a/pkgdel b/pkgdel
index c8e31cc..4d7ea09 100755
--- a/pkgdel
+++ b/pkgdel
@@ -175,7 +175,7 @@ while read -r line; do
 done < <(tac $INDEX_DIR/$name/.files | grep -v '/$')
 
 while read -r line; do
-	if [ ! "$(grep -R --exclude-dir="$name" -w "$line" "$INDEX_DIR"/*/.files)" ]; then
+	if [ ! "$(grep -Rx "$line" "$INDEX_DIR"/*/.files | grep -v "$INDEX_DIR"/$name)" ]; then
 		if [ -d "$ROOT_DIR/$line" ]; then
 			[ "$VERBOSE_REMOVE" = yes ] && echo "- $line"
 			rmdir "$ROOT_DIR/$line"