From 224013f573b15554e44060ed14f51da6f9e73b1a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 9 Dec 2023 17:47:46 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 6e9dae42..df755c22 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1561,8 +1561,6 @@ HOSTMGMT(){
 		idracip=${PW_HOST_IDRACS[${tmp}]}
 	elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
 		ESXIHOST=${HOST}
-		tmp=${PW_ESXI_HOST_NAMES[${HOST}]}
-		idracip=${PW_HOST_IDRACS[${tmp}]}
 	elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${HOST}]}" != "" ]; then
 		ESXIHOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
 		idracip=${PW_HOST_IDRACS[iDS-vMS-Host${tmp}]}
@@ -1573,8 +1571,11 @@ HOSTMGMT(){
 		ESXIHOST=''
 		idracip=''
 	fi
+	[ "${ESXIHOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+	tmp=${PW_ESXI_HOST_NAMES[${HOST}]}
+	idracip=${PW_HOST_IDRACS[${tmp}]}
+	
 	echo "HERE: ${ESXIHOST} - ${idracip}"
-	([ "${ESXIHOST}" == "" ] || [ "${idracip}" == "" ]) && echo -e "Invalid host\n" && exit 1
 	
 	hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
 	c=0; spcA=''; spc1=`expr 21 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done