From 57d86b9ef40cfc2b27270bb8d46308a7f29a55ce Mon Sep 17 00:00:00 2001
From: th33xitus <>
Date: Wed, 15 Jul 2020 22:02:42 +0200
Subject: [PATCH] Add checks for octoprint service when installing
 DWC2/Mainsail

---
 scripts/functions.sh        | 16 ++++++++++++----
 scripts/install_dwc2.sh     | 12 ++++++++----
 scripts/install_mainsail.sh |  4 ++++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/scripts/functions.sh b/scripts/functions.sh
index 29cf093..c4f7b66 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -220,15 +220,23 @@ flash_mcu(){
   start_klipper
 }
 
+enable_octoprint_service(){
+  status_msg "Octoprint Service is disabled! Enabling now ..."
+  sudo systemctl enable octoprint -q && sudo systemctl start octoprint
+}
+
+disable_octoprint_service(){
+  status_msg "Octoprint Service is enabled! Disabling now ..."
+  sudo systemctl stop octoprint && sudo systemctl disable octoprint -q
+}
+
 toggle_octoprint_service(){
   if systemctl is-enabled octoprint.service -q; then
-    status_msg "Service is enabled! Disabling now ..."
-    sudo systemctl stop octoprint && sudo systemctl disable octoprint -q
+    disable_octoprint_service
     sleep 2
     CONFIRM_MSG=" Octoprint Service is now >>> DISABLED <<< !"
   else
-    status_msg "Service is disabled! Enabling now ..."
-    sudo systemctl enable octoprint -q && sudo systemctl start octoprint
+    enable_octoprint_service
     sleep 2
     CONFIRM_MSG=" Octoprint Service is now >>> ENABLED <<< !"
   fi
diff --git a/scripts/install_dwc2.sh b/scripts/install_dwc2.sh
index 632f166..ca535ed 100644
--- a/scripts/install_dwc2.sh
+++ b/scripts/install_dwc2.sh
@@ -5,11 +5,15 @@
 dwc2_install_routine(){
   if [ -d $KLIPPER_DIR ]; then
     # check for existing installation
-    if [ -d ${HOME}/klippy-env/lib/python2.7/site-packages/tornado ]; then
-      ERROR_MSG=" Looks like DWC2 is already installed!\n Skipping..."
-      return
-    fi
+      if [ -d ${HOME}/klippy-env/lib/python2.7/site-packages/tornado ]; then
+        ERROR_MSG=" Looks like DWC2 is already installed!\n Skipping..."
+        return
+      fi
     stop_klipper
+    #disable octoprint service if installed
+      if systemctl is-enabled octoprint.service -q; then
+        disable_octoprint_service
+      fi
     install_tornado
     install_dwc2fk && dwc2fk_cfg
     install_dwc2
diff --git a/scripts/install_mainsail.sh b/scripts/install_mainsail.sh
index 4b93100..ef977d1 100644
--- a/scripts/install_mainsail.sh
+++ b/scripts/install_mainsail.sh
@@ -4,6 +4,10 @@ mainsail_install_routine(){
     dep=(wget curl unzip)
     dep_check
     #execute operation
+    #disable octoprint service if installed
+      if systemctl is-enabled octoprint.service -q; then
+        disable_octoprint_service
+      fi
     disable_wrong_webserver
     remove_wrong_webserver
     install_moonraker