From 3ed6266a0fb40c2e160f06d0f98bcb9a50e2bb35 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 9 Jan 2024 16:09:22 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/defaults.inc b/defaults.inc index 3a9334d0..4d5790ca 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.119-01092024' +VERS='2.5.120-01092024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 305103d9..1fac3a44 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -141,10 +141,10 @@ CHECKPOWER(){ echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" else - echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)" + echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)" fi echo -e "${idsCL[Default]}" @@ -155,10 +155,10 @@ CHECKPOWER(){ echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" else - echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts) ${idsCL[Default]}~ est" + echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts) ${idsCL[Default]}~ est" fi echo -e "${idsCL[Default]}"