From 018f63ccaaf5c2b76e5b776a35652c2f57f40003 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 12 Dec 2023 22:01:54 -0600
Subject: [PATCH] Update shutdown-test.sh

---
 shutdown-test.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/shutdown-test.sh b/shutdown-test.sh
index 833781e0..04e14bef 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -64,7 +64,7 @@ SHUTDOWN_SERVER2(){
 				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 					touch ${PW_TMPFOLDER}/shutdown.cls.offsite
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
@@ -76,7 +76,7 @@ SHUTDOWN_SERVER2(){
 				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c1001>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 					touch ${PW_TMPFOLDER}/shutdown.cls.mainsite
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
@@ -87,7 +87,7 @@ SHUTDOWN_SERVER2(){
 			echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 			if [ "${TEST}" != "true" ]; then
 				ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null & 2>&1 && service-control --start vmware-vpxd >/dev/null & 2>&1" >/dev/null & 2>&1 &
-				echo -e "${idsCL[Green]}Continuing in background${idsCL[Default]}\n"
+				echo -e "${idsCL[Green]}Continuing in background${idsCL[Default]}"
 			else
 				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 			fi
@@ -123,7 +123,7 @@ SHUTDOWN_SERVER2(){
 				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi
@@ -139,7 +139,7 @@ SHUTDOWN_SERVER2(){
 				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi
@@ -150,11 +150,11 @@ SHUTDOWN_SERVER2(){
 			echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 			if [ "${TEST}" != "true" ]; then
 				sleep 25s
-				echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+				echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 			else
 				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 			fi
-
+			echo
 		fi
 		
 		
@@ -164,7 +164,7 @@ SHUTDOWN_SERVER2(){
 			echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 			if [ "${TEST}" != "true" ]; then
 				${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 &
-				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}\n"
+				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
 			else
 				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 			fi
@@ -185,7 +185,7 @@ SHUTDOWN_SERVER2(){
 						${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 10.10.2.10 >/dev/null 2>&1 &
 						${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 10.10.2.17 >/dev/null 2>&1 &
 					fi
-					echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi
@@ -204,6 +204,7 @@ SHUTDOWN_SERVER2(){
 			elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
 				${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 &
 			fi
+			echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
 		else
 			echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 		fi
@@ -228,7 +229,7 @@ SHUTDOWN_SERVER2(){
 				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					while ping -qw 10 -c3 "10.10.2.10">/dev/null 2>&1; do sleep 1; done
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi
@@ -238,7 +239,7 @@ SHUTDOWN_SERVER2(){
 				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ] && [ "$(CHECK_HOST 10.10.2.10)" == "false" ]; then
 					run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2)
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi