Reorganize - logic; put common commands together

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
 }
  

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