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

---
 mm-scripts.sh | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index e83d926..357ae46 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -875,37 +875,40 @@ MMSETUP(){
 		
 		if [ "${EMAIL_NOTICE}" != "" ]; then
 			read -n 1 -p "Use previous email address [${EMAIL_NOTICE}] (Y/n)?" choice
-			case "$choice" in 
-				[Nn]) EMAIL_NOTICE="";;
-			esac
+			case "$choice" in; [Nn]) EMAIL_NOTICE="";;esac
 		fi
 		if [ "${EMAIL_NOTICE}" == "" ]; then
-			echo
-			echo -e -n "${idsCL[LightCyan]}(optional) SMTP notification address: ${idsCL[Default]}"
+			echo; echo -e -n "${idsCL[LightCyan]}(optional) SMTP notification address: ${idsCL[Default]}"
 			read -e EMAIL_NOTICE
 		fi
 		[ "${EMAIL_NOTICE}" != "" ] && echo "EMAIL_NOTICE=${EMAIL_NOTICE}" >> ${MMFOLDER}/settings.conf || echo "# EMAIL_NOTICE=email@address.com" >> ${MMFOLDER}/settings.conf
 		echo
 		
-		
-		
-		echo -e -n "${idsCL[LightCyan]}(optional) Pushover App Token: ${idsCL[Default]}"
-		read -e PUSHOVER_APP_TOKEN
 		if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
-	 		echo -e -n "${idsCL[LightCyan]}(optional) Pushover User Token: ${idsCL[Default]}"
-	 		read -e PUSHOVER_USER_TOKEN
-	 		if [ "${PUSHOVER_USER_TOKEN}" != "" ]; then
-				echo "PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"" >> ${MMFOLDER}/settings.conf
-				echo "PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\"" >> ${MMFOLDER}/settings.conf
-			else
-				echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
-				echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf				
-			fi
-		 else
-			echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
-			echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf	
-		 fi
+			read -n 1 -p "Use previous Pushover App Token [${PUSHOVER_APP_TOKEN}] (Y/n)?" choice
+			case "$choice" in; [Nn]) PUSHOVER_APP_TOKEN="";;esac
+		fi
+		if [ "${PUSHOVER_APP_TOKEN}" == "" ]; then
+			echo; echo -e -n "${idsCL[LightCyan]}(optional) Pushover App Token: ${idsCL[Default]}"
+			read -e PUSHOVER_APP_TOKEN
+		fi
+		[ "${PUSHOVER_APP_TOKEN}" != "" ] && echo "PUSHOVER_APP_TOKEN=${PUSHOVER_APP_TOKEN}" >> ${MMFOLDER}/settings.conf || echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
 		echo
+		
+		if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
+			if [ "${PUSHOVER_USER_TOKEN}" != "" ]; then
+				read -n 1 -p "Use previous Pushover User Token [${PUSHOVER_USER_TOKEN}] (Y/n)?" choice
+				case "$choice" in; [Nn]) PUSHOVER_USER_TOKEN="";;esac
+			fi
+			if [ "${PUSHOVER_USER_TOKEN}" == "" ]; then
+				echo; echo -e -n "${idsCL[LightCyan]}(optional) Pushover User Token: ${idsCL[Default]}"
+				read -e PUSHOVER_USER_TOKEN
+			fi
+			[ "${PUSHOVER_USER_TOKEN}" != "" ] && echo "PUSHOVER_USER_TOKEN=${PUSHOVER_USER_TOKEN}" >> ${MMFOLDER}/settings.conf || echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
+			echo
+		else
+			echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
+		fi
 			
 		cat	${MMFOLDER}/settings.conf