From 108a1bbeccd108de08909b46ad1396dbd5a6fa96 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 25 Feb 2023 18:34:23 -0600
Subject: [PATCH] Update mm-scripts.sh

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

diff --git a/mm-scripts.sh b/mm-scripts.sh
index 0e588dd..e7ae45e 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -60,7 +60,7 @@ MMSTART(){
 		echo
 		OUT=$(ip link | grep "$VPN_INTERFACE")			
 		if [ ${#OUT} = 0 ]; then
-			echo -en "${idsCL[LightCyan]}Setting up the VPN Tunnel config     :${idsCL[Default]}"
+			echo -en "${idsCL[LightCyan]}Setting up the VPN Tunnel config      :${idsCL[Default]}"
 			privkey=$(wg genkey)
 			reqpublickey=$(echo "${privkey}" | wg pubkey)
 			reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
@@ -93,11 +93,11 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
 			
 			
 			
-			echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel              :${idsCL[Default]}"
+			echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel               :${idsCL[Default]}"
 			"${VPN_START[@]}" >/dev/null 2>&1
 			sleep 5s
 		else
-			echo -en "${idsCL[Green]}The VPN Tunnel is already running    :${idsCL[Default]}"
+			echo -en "${idsCL[Green]}The VPN Tunnel is already running     :${idsCL[Default]}"
 		fi
 	else
 		mmsv='Verifying'
@@ -154,7 +154,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
 		# if [ "${zerogw}" != "${defaultgw}" ]; then
 		if [ "${defaultgw}" != "wg-torguard" ]; then
 			echo "$(date) - Adding VPN default routes" >> $logfile
-			echo -en "${idsCL[LightCyan]}Adding VPN default routes            :${idsCL[Default]}"
+			echo -en "${idsCL[LightCyan]}Adding VPN default routes              :${idsCL[Default]}"
 			/bin/ip route del default
 			/bin/ip route add default dev wg-torguard
 			/bin/ip route add 0.0.0.0/1 dev wg-torguard
@@ -167,7 +167,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
 		fi
 		
 		
-		echo -en "${idsCL[LightCyan]}Verifing default network routes      :${idsCL[Default]}"
+		echo -en "${idsCL[LightCyan]}Verifing default network routes       :${idsCL[Default]}"
 		checked=false
 		cc=0
 		until [ "${checked}" = "" ]; do
@@ -195,7 +195,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
 		echo -e "${idsCL[Green]} done${idsCL[Default]}"
 		
 		
-		echo -en "${idsCL[LightCyan]}Verifing traffic routing through VPN :${idsCL[Default]}"
+		echo -en "${idsCL[LightCyan]}Verifing traffic routing through VPN  :${idsCL[Default]}"
 		
 		scip=""
 		mmip=""
@@ -275,7 +275,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
 		
 		[ "${1}" == "start" ] && rm -f ${MMFOLDER}/mm.noservices
 		if [ "${2}" != "vpn" ] && [ ! -f ${MMFOLDER}/mm.noservices ]; then
-			echo -en "${idsCL[LightCyan]}${mmsv} Services                   :${idsCL[Default]}"
+			echo -en "${idsCL[LightCyan]}${mmsv} Services                    :${idsCL[Default]}"
 			for srvc in "${SERVICES_CHECK[@]}"; do
 				/bin/systemctl start ${srvc}
 			done
@@ -423,8 +423,8 @@ MMSTATUS(){
 				if [[ ${srvc} == *"vpn"* ]] || [[ ${srvc} == *"wireguard"* ]]; then
 					zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3)
 					defaultgw=$(ip route show | grep default | cut -d' ' -f 3)
-					echo -e "  |- 0.0.0.0 gateway                 : ${idsCL[Green]}$zerogw${idsCL[Default]}"
-					echo -en "  |- DEFAULT gateway                 : "
+					echo -e "  |- 0.0.0.0 gateway                  : ${idsCL[Green]}$zerogw${idsCL[Default]}"
+					echo -en "  |- DEFAULT gateway                  : "
 					if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "wg-torguard" ]; then
 						echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}"
 					else
@@ -438,11 +438,11 @@ MMSTATUS(){
 							echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 							MMSTART
 							
-							echo -e " ${NM_SERVICES[wireguard]}     : ${idsCL[Green]}Running${idsCL[Default]}"
+							echo -e " ${NM_SERVICES[wireguard]}      : ${idsCL[Green]}Running${idsCL[Default]}"
 							zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3)
 							defaultgw=$(ip route show | grep default | cut -d' ' -f 3)
-							echo -e "  |- 0.0.0.0 gateway                 : ${idsCL[Green]}$zerogw${idsCL[Default]}"
-							echo -en "  |- DEFAULT gateway                 : "
+							echo -e "  |- 0.0.0.0 gateway                  : ${idsCL[Green]}$zerogw${idsCL[Default]}"
+							echo -en "  |- DEFAULT gateway                  : "
 							if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "wg-torguard" ]; then
 								echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}"
 							else
@@ -455,7 +455,7 @@ MMSTATUS(){
 						fi
 					fi
 					
-					echo -en "  |- Verify traffic route to VPN ->  : "
+					echo -en "  |- Verify traffic route to VPN ->   : "
 					scip=$(dig +short sc1.scity.us @9.9.9.9)
 					mmip=$(dig +short myip.opendns.com @resolver1.opendns.com)
 					if [ "${scip}" != "${mmip}" ]; then