From f4373a22559fcce61ce2f8ff2e0305346cffc49d Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 29 Apr 2023 23:19:03 -0500
Subject: [PATCH] update

---
 defaults.inc  |  2 +-
 mm-scripts.sh | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index efc9172..6e16d8d 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='3.8.186-04232023'
+VERS='3.8.190-04232023'
 
 MMFOLDER="/opt/idssys/mediamanager"
 MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
diff --git a/mm-scripts.sh b/mm-scripts.sh
index cda4fdb..a6b0290 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -1150,20 +1150,21 @@ MMSETUP(){
 				exitstatus=$?; srvcs="$(join_by , $srvcs)";
 			fi
 			
-			echo -en "${idsCL[LightCyan]}Saving new settings ... ${idsCL[Default]}"
-			`\cp ${MMFOLDER}/settings.conf ${MMFOLDER}/settings.conf.bak`
-			sed -i '/SERVICESCHECK/d' ${MMFOLDER}/settings.conf
+			echo
+			echo -e "${idsCL[LightCyan]}Selected services: ${idsCL[Green]}${srvcs}${idsCL[Default]}"
+			
 			if [ "${srvcs}" != "" ]; then
 				echo
-				echo
-				echo -e "${idsCL[LightCyan]}Selected services: ${idsCL[Green]}${srvcs}${idsCL[Default]}"
+				echo -en "${idsCL[LightCyan]}Saving new settings ... ${idsCL[Default]}"
+				`\cp ${MMFOLDER}/settings.conf ${MMFOLDER}/settings.conf.bak`
+				sed -i '/SERVICESCHECK/d' ${MMFOLDER}/settings.conf
 				srvcs=${srvcs/tautulli/snap.tautulli.tautulli}
-				echo -e "\nSERVICESCHECK=${srvcs}\n\n#[OPTIONAL]" >> ${MMFOLDER}/settings.conf
+				echo -e "\nSERVICESCHECK=${srvcs}" >> ${MMFOLDER}/settings.conf
 			else
-				echo -e "\n# SERVICESCHECK=\n\n#[OPTIONAL]" >> ${MMFOLDER}/settings.conf
+				echo -e "\n# SERVICESCHECK=" >> ${MMFOLDER}/settings.conf
 			fi
 			echo
-			source /opt/idssys/mediamanager/settings.conf
+			source ${MMFOLDER}/settings.conf
 			IFS=,; SERVICES_CHECK=(${SERVICESCHECK}); unset IFS
 			echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 			echo
@@ -1236,7 +1237,7 @@ MMSETUP(){
 			[ "${EMAIL_NOTICE}" != "" ] && echo "EMAIL_NOTICE=${EMAIL_NOTICE}" >> ${MMFOLDER}/settings.conf || echo "# EMAIL_NOTICE=email@address.com" >> ${MMFOLDER}/settings.conf
 			[ "${PUSHOVER_APP_TOKEN}" != "" ] && echo "PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"" >> ${MMFOLDER}/settings.conf || echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
 			[ "${PUSHOVER_USER_TOKEN}" != "" ] && echo "PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\"" >> ${MMFOLDER}/settings.conf || echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
-			source /opt/idssys/mediamanager/settings.conf
+			source ${MMFOLDER}/settings.conf
 			IFS=,; SERVICES_CHECK=(${SERVICESCHECK}); unset IFS
 			echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 			echo