From 9ad39433c56894ef9fc1e552ef0182893847a3da Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 26 Mar 2023 21:23:41 -0500
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index e8c4b16..15c57ee 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -421,20 +421,22 @@ MMSTOP(){
 	c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
 	until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 	echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}"
-	
 	for srvc in "${!MM_SERVICES[@]}"; do
 		if [[ ${srvc} != *"vpn"* ]] && [[ ${srvc} != *"wireguard"* ]]; then
 			/bin/systemctl stop ${srvc} &
 		fi
 	done
-	checked=false
-	until [ "${checked}" = "" ]; do
-		for srvc in "${SERVICES_CHECK[@]}"; do
+	echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+	
+	msg="Waiting for Services to fully stop"
+	c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
+	until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+	echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}"
+	for srvc in "${SERVICES_CHECK[@]}"; do
+		checkport=$(lsof -Pi :${MM_SERVICE_PORTS[${srvc}]} -sTCP:LISTEN -t)
+		until [ "${checkport}" != "" ]; do
+			sleep 1s
 			checkport=$(lsof -Pi :${MM_SERVICE_PORTS[${srvc}]} -sTCP:LISTEN -t)
-			until [ "${checkport}" != "" ]; do
-				sleep 1s
-				checkport=$(lsof -Pi :${MM_SERVICE_PORTS[${srvc}]} -sTCP:LISTEN -t)
-			done
 		done
 	done
 	echo -e "${idsCL[Green]}Done${idsCL[Default]}"