From 0c4f1a53784f30bb1b3f4d3f6930d7cc4c279fa2 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Thu, 28 Jan 2021 18:52:53 +0100
Subject: [PATCH] fix: rework/refactor remove functions

---
 scripts/remove.sh | 280 +++++++++++++++++++++++-----------------------
 1 file changed, 142 insertions(+), 138 deletions(-)

diff --git a/scripts/remove.sh b/scripts/remove.sh
index 8988302..10e83d9 100755
--- a/scripts/remove.sh
+++ b/scripts/remove.sh
@@ -69,9 +69,13 @@ remove_klipper(){
   sudo systemctl daemon-reload
 
   ###removing klipper and klippy-env folders
-  if [ -d $KLIPPER_DIR ] || [ -d $KLIPPY_ENV ]; then
-    status_msg "Removing Klipper and klippy-env directory ..."
-    rm -rf $KLIPPER_DIR $KLIPPY_ENV && ok_msg "Directories removed!"
+  if [ -d $KLIPPER_DIR ]; then
+    status_msg "Removing Klipper directory ..."
+    rm -rf $KLIPPER_DIR && ok_msg "Directory removed!"
+  fi
+  if [ -d $KLIPPY_ENV ]; then
+    status_msg "Removing klippy-env directory ..."
+    rm -rf $KLIPPY_ENV && ok_msg "Directory removed!"
   fi
 
   CONFIRM_MSG=" Klipper was successfully removed!"
@@ -81,62 +85,68 @@ remove_klipper(){
 #############################################################
 
 remove_dwc2(){
-  data_arr=(
-  /etc/init.d/dwc
-  /etc/default/dwc
-  /etc/systemd/system/dwc.service
-  $DWC2FK_DIR
-  $DWC_ENV_DIR
-  $DWC2_DIR
-  /etc/nginx/sites-available/dwc2
-  /etc/nginx/sites-enabled/dwc2
-  )
-  print_error "DWC2-for-Klipper-Socket &\n DWC2 Web UI" && data_count=()
-  if [ "$ERROR_MSG" = "" ]; then
-    if systemctl is-active dwc -q; then
-      status_msg "Stopping DWC2-for-Klipper-Socket Service ..."
-      sudo systemctl stop dwc && sudo systemctl disable dwc
-      ok_msg "Service stopped!"
-    fi
-    #remove if init.d service
-    if [[ -e /etc/init.d/dwc || -e /etc/default/dwc ]]; then
-      status_msg "Init.d Service found ..."
-      status_msg "Removing DWC2-for-Klipper-Socket Service ..."
-      sudo rm -rf /etc/init.d/dwc /etc/default/dwc
-      sudo update-rc.d -f dwc remove
-      ok_msg "DWC2-for-Klipper-Socket Service removed!"
-    fi
-    #remove if systemd service
-    if [ -e /etc/systemd/system/dwc.service ]; then
-      status_msg "Systemd Service found ..."
-      status_msg "Removing DWC2-for-Klipper-Socket Service ..."
-      sudo rm -rf /etc/systemd/system/dwc.service
-      ok_msg "DWC2-for-Klipper-Socket Service removed!"
-    fi
-    if [ -d $DWC2FK_DIR ]; then
-      status_msg "Removing DWC2-for-Klipper-Socket directory ..."
-      rm -rf $DWC2FK_DIR && ok_msg "Directory removed!"
-    fi
-    if [ -d $DWC_ENV_DIR ]; then
-      status_msg "Removing DWC2-for-Klipper-Socket virtualenv ..."
-      rm -rf $DWC_ENV_DIR && ok_msg "File removed!"
-    fi
-    if [ -d $DWC2_DIR ]; then
-      status_msg "Removing DWC2 directory ..."
-      rm -rf $DWC2_DIR && ok_msg "Directory removed!"
-    fi
-    #remove dwc2 config for nginx
-    if [ -e /etc/nginx/sites-available/dwc2 ]; then
-      status_msg "Removing DWC2 configuration for Nginx ..."
-      sudo rm /etc/nginx/sites-available/dwc2 && ok_msg "File removed!"
-    fi
-    #remove dwc2 symlink for nginx
-    if [ -L /etc/nginx/sites-enabled/dwc2 ]; then
-      status_msg "Removing DWC2 Symlink for Nginx ..."
-      sudo rm /etc/nginx/sites-enabled/dwc2 && ok_msg "File removed!"
-    fi
-    CONFIRM_MSG=" DWC2-for-Klipper-Socket & DWC2 successfully removed!"
+  ### remove "legacy" init.d service
+  if [[ -e /etc/init.d/dwc || -e /etc/default/dwc ]]; then
+    status_msg "Removing DWC2-for-Klipper-Socket Service ..."
+    sudo systemctl stop dwc
+    sudo systemctl disable dwc
+    sudo rm -rf /etc/init.d/dwc /etc/default/dwc
+    sudo update-rc.d -f dwc remove
+    sudo systemctl daemon-reload
+    ok_msg "DWC2-for-Klipper-Socket Service removed!"
   fi
+
+  ### remove single instance
+  if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "dwc.service")" ]; then
+    status_msg "Removing DWC2-for-Klipper-Socket Service ..."
+    sudo systemctl stop dwc
+    sudo systemctl disable dwc
+    sudo rm -f $SYSTEMDDIR/dwc.service
+    ok_msg "DWC2-for-Klipper-Socket Service removed!"
+  fi
+  if [ -f /tmp/dwc.log ]; then
+    status_msg "Removing /tmp/dwc.log ..." && rm -f /tmp/dwc.log && ok_msg "Done!"
+  fi
+
+  ### remove multi instance services
+  if [ "$(systemctl list-units --full -all -t service --no-legend | grep -E "dwc-[[:digit:]].service")" ]; then
+    status_msg "Removing DWC2-for-Klipper-Socket Services ..."
+    for service in $(find $SYSTEMDDIR -maxdepth 1 -name "dwc-*.service" | cut -d"/" -f5)
+    do
+      status_msg "Removing $service ..."
+      sudo systemctl stop $service
+      sudo systemctl disable $service
+      sudo rm -f $SYSTEMDDIR/$service
+      ok_msg "Done!"
+    done
+  fi
+
+  ### remove multi instance logfiles
+  if [ "$(find /tmp -maxdepth 1 -name "dwc-*.log")" ]; then
+    for logfile in $(find /tmp -maxdepth 1 -name "dwc-*.log")
+    do
+      status_msg "Removing $logfile ..." && rm -f $logfile && ok_msg "Done!"
+    done
+  fi
+
+  ### reloading units
+  sudo systemctl daemon-reload
+
+  ### removing the rest of the folders
+  if [ -d $DWC2FK_DIR ]; then
+    status_msg "Removing DWC2-for-Klipper-Socket directory ..."
+    rm -rf $DWC2FK_DIR && ok_msg "Directory removed!"
+  fi
+  if [ -d $DWC_ENV_DIR ]; then
+    status_msg "Removing DWC2-for-Klipper-Socket virtualenv ..."
+    rm -rf $DWC_ENV_DIR && ok_msg "Directory removed!"
+  fi
+  if [ -d $DWC2_DIR ]; then
+    status_msg "Removing DWC2 directory ..."
+    rm -rf $DWC2_DIR && ok_msg "Directory removed!"
+  fi
+
+  CONFIRM_MSG=" DWC2-for-Klipper-Socket was successfully removed!"
 }
 
 #############################################################
@@ -189,12 +199,6 @@ remove_moonraker(){
   ###reloading units
   sudo systemctl daemon-reload
 
-  ###removing moonraker and moonraker-env folders
-  if [ -d $MOONRAKER_DIR ] || [ -d $MOONRAKER_ENV ]; then
-    status_msg "Removing Moonraker and moonraker-env directory ..."
-    rm -rf $MOONRAKER_DIR $MOONRAKER_ENV && ok_msg "Directories removed!"
-  fi
-
   #remove moonraker nginx config
   if [[ -e $NGINX_CONFD/upstreams.conf || -e $NGINX_CONFD/common_vars.conf ]]; then
     status_msg "Removing Moonraker NGINX configuration ..."
@@ -210,6 +214,16 @@ remove_moonraker(){
     status_msg "Removing API Key ..." && rm ${HOME}/.moonraker_api_key && ok_msg "Done!"
   fi
 
+  ###removing moonraker and moonraker-env folder
+  if [ -d $MOONRAKER_DIR ]; then
+    status_msg "Removing Moonraker directory ..."
+    rm -rf $MOONRAKER_DIR && ok_msg "Directory removed!"
+  fi
+  if [ -d $MOONRAKER_ENV ]; then
+    status_msg "Removing moonraker-env directory ..."
+    rm -rf $MOONRAKER_ENV && ok_msg "Directory removed!"
+  fi
+
   CONFIRM_MSG=" Moonraker was successfully removed!"
 }
 
@@ -217,57 +231,47 @@ remove_moonraker(){
 #############################################################
 
 remove_mainsail(){
-  data_arr=(
-  $MAINSAIL_DIR
-  /etc/nginx/sites-available/mainsail
-  /etc/nginx/sites-enabled/mainsail
-  )
-  print_error "Mainsail" && data_count=()
-  if [ "$ERROR_MSG" = "" ]; then
-    #remove mainsail dir
-    if [ -d $MAINSAIL_DIR ]; then
-      status_msg "Removing Mainsail directory ..."
-      rm -rf $MAINSAIL_DIR && ok_msg "Directory removed!"
-    fi
-    #remove mainsail config for nginx
-    if [ -e /etc/nginx/sites-available/mainsail ]; then
-      status_msg "Removing Mainsail configuration for Nginx ..."
-      sudo rm /etc/nginx/sites-available/mainsail && ok_msg "File removed!"
-    fi
-    #remove mainsail symlink for nginx
-    if [ -L /etc/nginx/sites-enabled/mainsail ]; then
-      status_msg "Removing Mainsail Symlink for Nginx ..."
-      sudo rm /etc/nginx/sites-enabled/mainsail && ok_msg "File removed!"
-    fi
-    CONFIRM_MSG="Mainsail successfully removed!"
+  ### remove mainsail dir
+  if [ -d $MAINSAIL_DIR ]; then
+    status_msg "Removing Mainsail directory ..."
+    rm -rf $MAINSAIL_DIR && ok_msg "Directory removed!"
   fi
+
+  ### remove mainsail config for nginx
+  if [ -e /etc/nginx/sites-available/mainsail ]; then
+    status_msg "Removing Mainsail configuration for Nginx ..."
+    sudo rm /etc/nginx/sites-available/mainsail && ok_msg "File removed!"
+  fi
+
+  ### remove mainsail symlink for nginx
+  if [ -L /etc/nginx/sites-enabled/mainsail ]; then
+    status_msg "Removing Mainsail Symlink for Nginx ..."
+    sudo rm /etc/nginx/sites-enabled/mainsail && ok_msg "File removed!"
+  fi
+
+  CONFIRM_MSG="Mainsail successfully removed!"
 }
 
 remove_fluidd(){
-  data_arr=(
-  $FLUIDD_DIR
-  /etc/nginx/sites-available/fluidd
-  /etc/nginx/sites-enabled/fluidd
-  )
-  print_error "Fluidd" && data_count=()
-  if [ "$ERROR_MSG" = "" ]; then
-    #remove fluidd dir
-    if [ -d $FLUIDD_DIR ]; then
-      status_msg "Removing Fluidd directory ..."
-      rm -rf $FLUIDD_DIR && ok_msg "Directory removed!"
-    fi
-    #remove fluidd config for nginx
-    if [ -e /etc/nginx/sites-available/fluidd ]; then
-      status_msg "Removing Fluidd configuration for Nginx ..."
-      sudo rm /etc/nginx/sites-available/fluidd && ok_msg "File removed!"
-    fi
-    #remove fluidd symlink for nginx
-    if [ -L /etc/nginx/sites-enabled/fluidd ]; then
-      status_msg "Removing Fluidd Symlink for Nginx ..."
-      sudo rm /etc/nginx/sites-enabled/fluidd && ok_msg "File removed!"
-    fi
-    CONFIRM_MSG="Fluidd successfully removed!"
+  ### remove fluidd dir
+  if [ -d $FLUIDD_DIR ]; then
+    status_msg "Removing Fluidd directory ..."
+    rm -rf $FLUIDD_DIR && ok_msg "Directory removed!"
   fi
+
+  ### remove fluidd config for nginx
+  if [ -e /etc/nginx/sites-available/fluidd ]; then
+    status_msg "Removing Fluidd configuration for Nginx ..."
+    sudo rm /etc/nginx/sites-available/fluidd && ok_msg "File removed!"
+  fi
+
+  ### remove fluidd symlink for nginx
+  if [ -L /etc/nginx/sites-enabled/fluidd ]; then
+    status_msg "Removing Fluidd Symlink for Nginx ..."
+    sudo rm /etc/nginx/sites-enabled/fluidd && ok_msg "File removed!"
+  fi
+
+  CONFIRM_MSG="Fluidd successfully removed!"
 }
 
 #############################################################
@@ -299,17 +303,21 @@ remove_octoprint(){
   ###reloading units
   sudo systemctl daemon-reload
 
-  ### remove .octoprint directories
-  if [ -d ${HOME}/OctoPrint ] || [ -d ${HOME}/.octoprint* ]; then
-    status_msg "Removing OctoPrint and .octoprint directory ..."
-    rm -rf ${HOME}/OctoPrint ${HOME}/.octoprint* && ok_msg "Directories removed!"
-  fi
-
   ### remove sudoers file
   if [ -f /etc/sudoers.d/octoprint-shutdown ]; then
     sudo rm -rf /etc/sudoers.d/octoprint-shutdown
   fi
 
+  ### remove OctoPrint and .octoprint directories
+  if [ -d ${HOME}/OctoPrint ]; then
+    status_msg "Removing OctoPrint directory ..."
+    rm -rf ${HOME}/OctoPrint && ok_msg "Directory removed!"
+  fi
+  if [ -d ${HOME}/.octoprint* ]; then
+    status_msg "Removing .octoprint directory ..."
+    rm -rf ${HOME}/.octoprint* && ok_msg "Directory removed!"
+  fi
+
   CONFIRM_MSG=" OctoPrint successfully removed!"
 }
 
@@ -333,27 +341,23 @@ remove_nginx(){
 }
 
 remove_klipperscreen(){
-  data_arr=(
-  $KLIPPERSCREEN_DIR
-  $KLIPPERSCREEN_ENV_DIR
-  /etc/systemd/system/KlipperScreen.service
-  )
-  print_error "KlipperScreen" && data_count=()
-  if [ "$ERROR_MSG" = "" ]; then
-    #remove KlipperScreen dir
-    if [ -d $KLIPPERSCREEN_DIR ]; then
-      status_msg "Removing KlipperScreen directory ..."
-      rm -rf $KLIPPERSCREEN_DIR && ok_msg "Directory removed!"
-    fi
-    if [ -d $KLIPPERSCREEN_ENV_DIR ]; then
-      status_msg "Removing KlipperScreen VENV directory ..."
-      rm -rf $KLIPPERSCREEN_ENV_DIR && ok_msg "Directory removed!"
-    fi
-    #remove KlipperScreen systemd file
-    if [ -e /etc/systemd/system/KlipperScreen.service ]; then
-      status_msg "Removing KlipperScreen Service ..."
-      sudo rm /etc/systemd/system/KlipperScreen.service && ok_msg "File removed!"
-    fi
-    CONFIRM_MSG="KlipperScreen successfully removed!"
+  ### remove KlipperScreen dir
+  if [ -d $KLIPPERSCREEN_DIR ]; then
+    status_msg "Removing KlipperScreen directory ..."
+    rm -rf $KLIPPERSCREEN_DIR && ok_msg "Directory removed!"
   fi
+
+  ### remove KlipperScreen VENV dir
+  if [ -d $KLIPPERSCREEN_ENV_DIR ]; then
+    status_msg "Removing KlipperScreen VENV directory ..."
+    rm -rf $KLIPPERSCREEN_ENV_DIR && ok_msg "Directory removed!"
+  fi
+
+  ### remove KlipperScreen systemd file
+  if [ -e /etc/systemd/system/KlipperScreen.service ]; then
+    status_msg "Removing KlipperScreen Service ..."
+    sudo rm /etc/systemd/system/KlipperScreen.service && ok_msg "File removed!"
+  fi
+
+  CONFIRM_MSG="KlipperScreen successfully removed!"
 }