From dc6fea8c3bc57048e2afc99b5386ffa291f7faee Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Sat, 30 Jan 2021 18:19:49 +0100
Subject: [PATCH] fix: enable mainsail remoteMode if its already installed
 before moonraker

---
 scripts/install_klipper_webui.sh | 10 +++++++---
 scripts/install_moonraker.sh     |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/install_klipper_webui.sh b/scripts/install_klipper_webui.sh
index fde87a8..cf7c5cb 100755
--- a/scripts/install_klipper_webui.sh
+++ b/scripts/install_klipper_webui.sh
@@ -243,15 +243,19 @@ mainsail_setup(){
   status_msg "Remove downloaded archive ..."
   rm -rf *.zip && ok_msg "Done!"
 
-  ### check for moonraker multi-instance and if multi-instance was found, activate mainsail remoteMode
+  ### check for moonraker multi-instance and if multi-instance was found, enable mainsails remoteMode
   if [ $(ls /etc/systemd/system/moonraker* | wc -l) -gt 1 ]; then
-    rm -f $MAINSAIL_DIR/config.json
-    echo -e "{\n    \"remoteMode\":true\n}" >> $MAINSAIL_DIR/config.json
+    enable_mainsail_remotemode
   fi
 
   ok_msg "Mainsail installation complete!\n"
 }
 
+enable_mainsail_remotemode(){
+  rm -f $MAINSAIL_DIR/config.json
+  echo -e "{\n    \"remoteMode\":true\n}" >> $MAINSAIL_DIR/config.json
+}
+
 fluidd_setup(){
   ### get fluidd download url
   FLUIDD_DL_URL=$(curl -s https://api.github.com/repositories/295836951/releases/latest | grep browser_download_url | cut -d'"' -f4)
diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh
index f725fd6..db7fd5f 100755
--- a/scripts/install_moonraker.sh
+++ b/scripts/install_moonraker.sh
@@ -139,6 +139,10 @@ moonraker_setup(){
     create_single_moonraker_instance
   else
     create_multi_moonraker_instance
+    ### step 6.5: enable mainsails remoteMode if its already installed
+    if [ -d $MAINSAIL_DIR ]; then
+      enable_mainsail_remotemode
+    fi
   fi
 }