From 143e0f2ee2c77d17bf36a5aa18ec3d2e2295192d Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 11 Feb 2024 09:19:55 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 1b1b2cfa..5f96762d 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -205,8 +205,9 @@ CHECKPOWER(){
 				APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
 			fi
-			AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W ${idsCL[Default]}"
+			# AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -en "${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W ${idsCL[Default]}"
+			[ "${avgdays}" != "" ] && echo -e "	"
 			
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages  ... "
@@ -215,8 +216,8 @@ CHECKPOWER(){
 				NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
 			fi
-			AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W ${idsCL[Default]}"
+			# AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W ${idsCL[Default]}"
 			
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages  ... "
@@ -225,8 +226,8 @@ CHECKPOWER(){
 				AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
 			fi
-			AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W ${idsCL[Default]}"
+			# AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W ${idsCL[Default]}"
 			
 			DIVIDER . lightCyan ${PRI_WIDTH}
 			if [ "${avgdays}" != "" ]; then
@@ -239,10 +240,10 @@ CHECKPOWER(){
 				SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
 			fi
-			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W ${idsCL[Default]}"
-			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsCL[Default]}"
+			# AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W ${idsCL[Default]}"
+			# AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsCL[Default]}"
 			DIVIDER . lightCyan ${PRI_WIDTH}
 		fi