From 83d4d41092466c4f91e640ff58fab7a9018eb952 Mon Sep 17 00:00:00 2001
From: vdo <vdo@greyfaze.net>
Date: Mon, 6 Jun 2022 22:01:06 +0100
Subject: [PATCH] uninstall fixes

---
 .env      |  1 -
 uninstall | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 0411fb5..1c40fc4 100644
--- a/.env
+++ b/.env
@@ -10,7 +10,6 @@ MONEROD_TAG=latest
 MONEROD_RPC_PORT=18081
 MONEROD_RESTRICTED_RPC_PORT=18089
 MONEROD_P2P_PORT=18080
-#MONEROD_EXTRA_PARAMS=--prune-blockchain
 MONEROD_EXTRA_PARAMS=
 MONEROD_accessControlAllowOriginList=*
 
diff --git a/uninstall b/uninstall
index 428f160..47c79ff 100755
--- a/uninstall
+++ b/uninstall
@@ -7,21 +7,21 @@
 Off='\033[0m' # Text Reset
 
 # Regular Colors
-Red='\033[0;31m'    # Red
-Green='\033[0;32m'  # Green
-Yellow='\033[0;33m' # Yellow
-Purple='\033[0;35m' # Purple
-White='\033[0;37m'  # White
+Red='\033[0;31m'   # Red
+Green='\033[0;32m' # Green
+#Yellow='\033[0;33m' # Yellow
+#Purple='\033[0;35m' # Purple
+White='\033[0;37m' # White
 
 # Background
 On_Black='\033[40m' # Black
 
 OkBullet="${Green}${On_Black}:: ${White}${On_Black}"
-WarnBullet="${Yellow}${On_Black}:: ${White}${On_Black}"
+#WarnBullet="${Yellow}${On_Black}:: ${White}${On_Black}"
 ErrBullet="${Red}${On_Black}:: ${White}${On_Black}"
 Ok="${Green}${On_Black} ok.${Off}"
 Fail="${Red}${On_Black} failed!${Off}"
-Nok="${Yellow}${On_Black} nok.${Off}"
+#Nok="${Yellow}${On_Black} nok.${Off}"
 
 ################################################################
 # Vars                                                         #
@@ -65,17 +65,18 @@ uninstall() {
         [Yy]*)
             find . -type f -not -name 'data' -print0 | xargs -0 -I {} rm {}
             check_return $?
+            popd >>"${XMRSH_LOG_FILE}" 2>&1 || check_return $?
             break
             ;;
         [Nn]*)
-            rm -rf ./*
+            popd >>"${XMRSH_LOG_FILE}" 2>&1 || check_return $?
+            rm -rf "${XMRSH_DIR}"
             check_return $?
             break
             ;;
         *) echo "   Please answer yes or no." ;;
         esac
     done
-    popd || check_return $?
     echo -e "${OkBullet}Uninstall complete."
 }