From 0a808f8c4aa5635e1416413fbaf1c7a3fecfeed2 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 22 Apr 2023 17:45:07 -0500
Subject: [PATCH] Update mm-scripts.sh

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

diff --git a/mm-scripts.sh b/mm-scripts.sh
index c5b6da2..76b5e09 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -906,33 +906,33 @@ MMSETUP(){
 	case "$choice" in 
 		[Yy])
 			echo
-			echo -en "${idsCL[LightCyan]}Hostname [Default='${idsCL[White]}Media-Manager${idsCL[LightCyan]}']: ${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}Hostname [Default='${idsCL[White]}Media-Manager${idsCL[LightYellow]}']: ${idsCL[Default]}"
 			read -e HOSTNAME
 			[ "${HOSTNAME}" == "" ] && HOSTNAME="Media-Manager"
 			echo
 			REPIP=`hostname -I`
 			REPIP=${REPIP/ /}
-			echo -en "${idsCL[LightCyan]}IP Address [Current='${idsCL[White]}${REPIP}${idsCL[LightCyan]}']: ${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}IP Address [Current='${idsCL[White]}${REPIP}${idsCL[LightYellow]}']: ${idsCL[Default]}"
 			read -e IPADDRESS
 			[ "${IPADDRESS}" == "" ] && IPADDRESS=${REPIP}
 			echo
 			REPSUB=`/sbin/ifconfig eth0 | awk '/netmask/{ print $4;} '`
-			echo -en "${idsCL[LightCyan]}Subnet Mask [Current='${idsCL[White]}${REPSUB}${idsCL[LightCyan]}']: ${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}Subnet Mask [Current='${idsCL[White]}${REPSUB}${idsCL[LightYellow]}']: ${idsCL[Default]}"
 			read -e SUBNET
 			[ "${SUBNET}" == "" ] && SUBNET=${REPSUB}
 			echo
 			REPGW=`route -n | grep 'UG[ \t]' | awk '{print $2}'`
-			echo -en "${idsCL[LightCyan]}Gateway IP [Current='${idsCL[White]}${REPGW}${idsCL[LightCyan]}']: ${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}Gateway IP [Current='${idsCL[White]}${REPGW}${idsCL[LightYellow]}']: ${idsCL[Default]}"
 			read -e GATEWAY
 			[ "${GATEWAY}" == "" ] && GATEWAY=${REPGW}
 			echo
 			REPPRIDNS=`resolvectl -i eth0 dns | awk '/eth0/{ print $4;} '`
-			echo -en "${idsCL[LightCyan]}Primary DNS [Current='${idsCL[White]}${REPPRIDNS}${idsCL[LightCyan]}']: ${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}Primary DNS [Current='${idsCL[White]}${REPPRIDNS}${idsCL[LightYellow]}']: ${idsCL[Default]}"
 			read -e PRIDNS
 			[ "${PRIDNS}" == "" ] && PRIDNS=${REPPRIDNS}
 			echo
 			REPSECDNS=`resolvectl -i eth0 dns | awk '/eth0/{ print $5;} '`
-			echo -en "${idsCL[LightCyan]}Secondary DNS (optional) [Current='${idsCL[White]}${REPSECDNS}${idsCL[LightCyan]}']: ${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}Secondary DNS (optional) [Current='${idsCL[White]}${REPSECDNS}${idsCL[LightYellow]}']: ${idsCL[Default]}"
 			read -e SECDNS
 			[ "${SECDNS}" == "" ] && SECDNS=${REPSECDNS}
 			echo
@@ -1020,26 +1020,26 @@ MMSETUP(){
 			echo -e "${idsCL[LightCyan]}You may choose to setup notifications by either SMTP and/or Pushover:${idsCL[Default]}"
 		
 			if [ "${EMAIL_NOTICE}" != "" ]; then
-				echo -en "${idsCL[LightCyan]}Use previous email address [${EMAIL_NOTICE}] (Y/n)? ${idsCL[Default]}"
+				echo -en "${idsCL[LightYellow]}Use previous email address [${idsCL[White]}${EMAIL_NOTICE}${idsCL[LightYellow]}] (Y/n)? ${idsCL[Default]}"
 				read -n 1 choice
 				case "$choice" in
 					[Nn]) EMAIL_NOTICE="";;esac
 			fi
 			if [ "${EMAIL_NOTICE}" == "" ]; then
-				echo; echo -e -n "${idsCL[LightCyan]}(optional) Email notification address: ${idsCL[Default]}"
+				echo; echo -e -n "${idsCL[LightYellow]}(optional) Email 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
 			if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
-				echo -en "${idsCL[LightCyan]}Use previous Pushover App Token [${PUSHOVER_APP_TOKEN}] (Y/n)? ${idsCL[Default]}"
+				echo -en "${idsCL[LightYellow]}Use previous Pushover App Token [${idsCL[White]}${PUSHOVER_APP_TOKEN}${idsCL[LightYellow]}] (Y/n)? ${idsCL[Default]}"
 				read -n 1 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]}"
+				echo; echo -e -n "${idsCL[LightYellow]}(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
@@ -1047,13 +1047,13 @@ MMSETUP(){
 			echo
 			if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
 				if [ "${PUSHOVER_USER_TOKEN}" != "" ]; then
-					echo -en "${idsCL[LightCyan]}Use previous Pushover User Token [${PUSHOVER_USER_TOKEN}] (Y/n)? ${idsCL[Default]}"
+					echo -en "${idsCL[LightYellow]}Use previous Pushover User Token [${idsCL[White]}${PUSHOVER_USER_TOKEN}${idsCL[LightYellow]}] (Y/n)? ${idsCL[Default]}"
 					read -n 1 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]}"
+					echo; echo -e -n "${idsCL[LightYellow]}(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
@@ -1065,7 +1065,8 @@ MMSETUP(){
 			source /opt/idssys/mediamanager/settings.conf
 			IFS=,; SERVICES_CHECK=(${SERVICESCHECK}); unset IFS
 			
-			echo -en "${idsCL[LightCyan]}Would you like to update media management services [${srvcs2}] (Y/n)? ${idsCL[Default]}"
+			echo -en "${idsCL[LightCyan]}Would you like to update media management services:"
+			echo -en "${idsCL[LightYellow]}[${idsCL[White]}${srvcs2}${idsCL[LightYellow]}] (Y/n)? ${idsCL[Default]}"
 			read -n 1 choice
 			case "$choice" in
 				[Nn]) tmp='';;