From da4d332fc9df0192e8e4ea2153492be97e32fda2 Mon Sep 17 00:00:00 2001
From: tomogoma <ogomatom@gmail.com>
Date: Fri, 11 Nov 2016 18:00:43 +0300
Subject: [PATCH] Reorganize - logic; put common commands together

---
 systemdInstaller.sh   |  2 +-
 systemdUninstaller.sh | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/systemdInstaller.sh b/systemdInstaller.sh
index d2d305b..1a3f27a 100755
--- a/systemdInstaller.sh
+++ b/systemdInstaller.sh
@@ -21,7 +21,7 @@ function setInstallDirs {
 	extension="${filename##*.}"
 	filename="${filename%.*}"
 	mv -f "$filename/cockroach" "$APP_DIR/cockroach" || exit 1
-    rm -r "$filename"
+    rm -rf "$filename"
 	mkdir -p "$DATA_DIR" || exit 1
 }
   
diff --git a/systemdUninstaller.sh b/systemdUninstaller.sh
index b1bcb12..6314143 100755
--- a/systemdUninstaller.sh
+++ b/systemdUninstaller.sh
@@ -8,13 +8,14 @@ DATA_DIR="/var/data/cockroachdb/"
 
 echo "Uninstalling..."
 
-if [ -f "$APP_FILE" ]; then
+if [ -f "$SYSTEMD_FILE" ]; then
 	systemctl stop cockroach.service >/dev/null
-	rm -rf "$APP_FILE"
+	rm -f "$SYSTEMD_FILE"
+    systemctl daemon-reload
 fi
 
-if [ -f "$SYSTEMD_FILE" ]; then
-	rm -f "$SYSTEMD_FILE"
+if [ -f "$APP_FILE" ]; then
+	rm -f "$APP_FILE"
 fi
 
 if [ -d "$ETCD_DIR" ]; then
@@ -26,6 +27,4 @@ fi
 echo "Data at $DATA_DIR not removed, run 'rm $DATA_DIR' if you wish to delete"
 echo "Done!"
 
-`systemctl daemon-reload`
-
 exit 0
-- 
GitLab