From aed9b5f648923e2a9a38ceb71f825301b504c9de Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 21 Apr 2023 22:47:24 -0500
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 51 ++++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index 9a8a06b..a33ae1d 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -861,34 +861,31 @@ MMSETUP(){
 			sed -i '/EMAIL_NOTICE/d' ${MMFOLDER}/settings.conf
 			sed -i '/OPTIONAL/d' ${MMFOLDER}/settings.conf
 			sed -i '/^$/d' ${MMFOLDER}/settings.conf
-			
 			echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-			declare -A sel_srvcs
-			for srvc in "${MM_SERVICES[@]}"; do
-				[ "${srvc}" == "bazarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['bazarr']=ON || sel_srvcs['bazarr']=ON
-				[ "${srvc}" == "jackett" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['jackett']=ON || sel_srvcs['jackett']=ON
-				[ "${srvc}" == "lidarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['lidarr']=ON || sel_srvcs['lidarr']=OFF
-				[ "${srvc}" == "ombi" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['ombi']=ON || sel_srvcs['ombi']=ON
-				[ "${srvc}" == "qbittorrent" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['qbittorrent']=ON || sel_srvcs['qbittorrent']=ON
-				[ "${srvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['radarr']=ON || sel_srvcs['radarr']=ON
-				[ "${srvc}" == "radarr3d" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['radarr3d']=ON || sel_srvcs['radarr3d']=OFF
-				[ "${srvc}" == "sonarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['sonarr']=ON || sel_srvcs['sonarr']=ON
-				[ "${srvc}" == "snap.tautulli.tautulli" ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${srvc} " ]] && sel_srvcs['snap.tautulli.tautulli']=ON || sel_srvcs['snap.tautulli.tautulli']=ON
-			done
-		
-			export NEWT_COLORS=''
-			srvcs=$(whiptail --title "Media Manager Service Selector" --checklist --separate-output \
-			"\nPlease select which services to enable for this system:" 0 70 16 \
-			"bazarr" "Bazarr (Subtitle Manager)" ${sel_srvcs['bazarr'']} \
-			"jackett" "Jackett (Torrent Indexing Manager)       " ${sel_srvcs['jackett']} \
-			"lidarr" "Lidarr (Music Manager)" ${sel_srvcs['lidarr']} \
-			"ombi" "Ombi (Download Requester)" ${sel_srvcs['ombi']} \
-			"qbittorrent" "qBittorrent (Torrent Downloader)" ON \
-			"radarr" "Radarr (Movie Manager)" ${sel_srvcs['radarr']} \
-			"radarr3d" "Radarr3D (3D Movie Manager)" ${sel_srvcs['radarr3d']} \
-			"sonarr" "Sonarr (TV Show Manager)" ${sel_srvcs['sonarr'']} \
-			"tautulli" "Tautulli (Plex Stats)" ${sel_srvcs['snap.tautulli.tautulli']} 3>&1 1>&2 2>&3)
-			exitstatus=$?; srvcs="$(join_by , $srvcs)"; srvcs=${srvcs/tautulli/snap.tautulli.tautulli}
+			
+			
+			if [ "${SERVICESCHECK}" != "" ]; then
+				srvcs=${SERVICESCHECK/snap.tautulli.tautulli/tautulli}
+				read -n 1 -p "Run previous services [${srvcs}] (Y/n)?" choice
+				case "$choice" in
+					[Nn]) SERVICESCHECK="";;esac
+			fi
+			if [ "${SERVICESCHECK}" == "" ]; then
+				export NEWT_COLORS=''
+				srvcs=$(whiptail --title "Media Manager Service Selector" --checklist --separate-output \
+				"\nPlease select which services to enable for this system:" 0 70 16 \
+				"bazarr" "Bazarr (Subtitle Manager)" ON \
+				"jackett" "Jackett (Torrent Indexing Manager)       " ON \
+				"lidarr" "Lidarr (Music Manager)" OFF \
+				"ombi" "Ombi (Download Requester)" ON \
+				"qbittorrent" "qBittorrent (Torrent Downloader)" ON \
+				"radarr" "Radarr (Movie Manager)" ON \
+				"radarr3d" "Radarr3D (3D Movie Manager)" OFF \
+				"sonarr" "Sonarr (TV Show Manager)" ON \
+				"tautulli" "Tautulli (Plex Stats)" ON 3>&1 1>&2 2>&3)
+				exitstatus=$?; srvcs="$(join_by , $srvcs)";
+			fi
+			srvcs=${srvcs/tautulli/snap.tautulli.tautulli}
 			echo -e "\nSERVICESCHECK=${srvcs}\n\n#[OPTIONAL]" >> ${MMFOLDER}/settings.conf
 	
 			echo