From d38f6fc2199cc75f8abb7ce5b311de906311548b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 09:29:45 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index ac80a3a6..c3dd45c3 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -242,13 +242,17 @@ 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 -en "${idsCL[White]}Server Room ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${SVRRM_AMP_avg}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo + if [ "${avgdays}" != "" ]; then + AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + echo -e " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo + fi - # 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 -en "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP_WAC}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${SVRRM_AMP_WAC_avg}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo + if [ "${avgdays}" != "" ]; then + AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + echo -e " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo + fi DIVIDER . lightCyan ${PRI_WIDTH} fi