From 50a75fa442ecdd67854ef94aad446d32f208ccc5 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 18 May 2023 21:40:36 -0500
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index 4c00fb4..774f794 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -827,7 +827,13 @@ VPNSPEEDTEST(){
 }
 
 UPDATESERVICE(){
-	if [ "${1}" != "" ]; then
+	if [ "${1}" == "all" ]; then
+		for usrvc in "${UPDATE_SERVICES[@]}"; do
+			[ "${MM_UPDATE_REPO[${usrvc}]}" != "" ] && UPDATESERVICE ${usrvc} ${2}
+		done
+		;;
+	
+	elif [ "${1}" != "" ]; then
 		usrvc=${1}
 		echo "${usrvc} Update" > ${TMPFOLDER}/mm.update.stop
 		echo "$(date) - Updating Service (${usrvc}) : Starting" >> $logfile
@@ -1370,22 +1376,21 @@ MMSETUP(){
 USAGE(){
 	echo -e "${idsCL[White]} Usage: ${idsCL[LightCyan]}mm {option}"
 	echo
-	echo -e "    ${idsCL[Yellow]}start                      ${idsCL[Default]}--> Start services"
-	echo -e "    ${idsCL[Yellow]}stop                       ${idsCL[Default]}--> Stop services"
-	echo -e "    ${idsCL[Yellow]}restart                    ${idsCL[Default]}--> Restart services"
+	echo -e "    ${idsCL[Yellow]}start                               ${idsCL[Default]}--> Start services"
+	echo -e "    ${idsCL[Yellow]}stop                                ${idsCL[Default]}--> Stop services"
+	echo -e "    ${idsCL[Yellow]}restart                             ${idsCL[Default]}--> Restart services"
 	echo
-	echo -e "    ${idsCL[Yellow]}status                     ${idsCL[Default]}--> Check Status on VPN and Media Services"
-	echo -e "    ${idsCL[Yellow]}vpninfo                    ${idsCL[Default]}--> Show VPN Info"
-	echo -e "    ${idsCL[Yellow]}speedtest                  ${idsCL[Default]}--> Run Speedtest Comparison (with and w/o VPN)"
+	echo -e "    ${idsCL[Yellow]}status                              ${idsCL[Default]}--> Check Status on VPN and Media Services"
+	echo -e "    ${idsCL[Yellow]}vpninfo                             ${idsCL[Default]}--> Show VPN Info"
+	echo -e "    ${idsCL[Yellow]}speedtest                           ${idsCL[Default]}--> Run Speedtest Comparison (with and w/o VPN)"
 	echo
-	echo -e "    ${idsCL[Yellow]}update-allservices         ${idsCL[Default]}--> Update all services ( -f = force update)"
-	echo -e "    ${idsCL[Yellow]}update-service <service>   ${idsCL[Default]}--> Update specified service ( -f = force update)"
-	echo -e "    ${idsCL[Yellow]}update-list                ${idsCL[Default]}--> List available releases"
+	echo -e "    ${idsCL[Yellow]}update-service {<service> or all}   ${idsCL[Default]}--> Update specified service, or all ( -f = force update)"
+	echo -e "    ${idsCL[Yellow]}update-list                         ${idsCL[Default]}--> List available releases"
 	echo
-	echo -e "    ${idsCL[Yellow]}cron                       ${idsCL[Default]}--> Crontab job for maintaining system (run */1 min)"
-	echo -e "    ${idsCL[Yellow]}update                     ${idsCL[Default]}--> Check for and install new MM updates"
-	# echo -e "    ${idsCL[Yellow]}clear                      ${idsCL[Default]}--> Clear all tmp MM system files, not normally needed"
-	echo -e "    ${idsCL[Yellow]}setup                      ${idsCL[Default]}--> Setup/Reconfigure (Network/Services/SSHFS Mount)"
+	echo -e "    ${idsCL[Yellow]}cron                                ${idsCL[Default]}--> Crontab job for maintaining system (run */1 min)"
+	echo -e "    ${idsCL[Yellow]}update                              ${idsCL[Default]}--> Check for and install new MM updates"
+	# echo -e "    ${idsCL[Yellow]}clear                               ${idsCL[Default]}--> Clear all tmp MM system files, not normally needed"
+	echo -e "    ${idsCL[Yellow]}setup                               ${idsCL[Default]}--> Setup/Reconfigure (Network/Services/SSHFS Mount)"
 	echo
 	echo
 	srvcsavail="$(join_by , ${MM_SERVICES})"
@@ -1481,12 +1486,6 @@ if [ ! -f ${TMPFOLDER}/mm.update.stop ]; then
 		update);;
 		update-list) SHOWSRVCUPDATES;;
 		update-service) UPDATESERVICE ${2} ${3};;
-		update-allservices)
-			# for usrvc in "${SERVICES_CHECK[@]}"; do
-			for usrvc in "${UPDATE_SERVICES[@]}"; do
-				[ "${MM_UPDATE_REPO[${usrvc}]}" != "" ] && UPDATESERVICE ${usrvc} ${2}
-			done
-			;;
 		
 		*) USAGE;;