From aa5015293d524fcc471f97ce493874a0ab307419 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 4 Nov 2023 11:57:04 -0500 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 6cffdcbb..bac10758 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -20,8 +20,8 @@ CHECKTEMP(){ cw=25; echo - if [ "${1}" != "noavg" ]; then - [ "${1}" != "" ] && [[ "${1}" =~ ^[0-9]+$ ]] && avgdays=${1} || avgdays=3 + [ "${1}" != "" ] && avgdays=${1} || avgdays=noavg + if [ "${avgdays}" != "noavg" ]; then [ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays} echo -e "${idsCL[Cyan]}Sensor Temperature(s) Current / ${avgdays_disp}DayAVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}" else @@ -69,9 +69,9 @@ CHECKTEMP(){ c=0; spc=''; spc1=`expr ${cw} - ${#sensorname} - 1`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done - [ "${1}" != "noavg" ] && echo -en "${idsCL[LightCyan]} ${sensorname}${spc}${idsCL[Default]}: ${idsCL[LightYellow]}Calculating ${avgdays} Day average ..." + [ "${avgdays}" != "noavg" ] && echo -en "${idsCL[LightCyan]} ${sensorname}${spc}${idsCL[Default]}: ${idsCL[LightYellow]}Calculating ${avgdays} Day average ..." reading=$(CHECKTEMPSENSOR ${SENSOR} ${temp_c} ${temp_warn} ${temp_crit} ${sensorname// /_} ${1}) - [ "${1}" != "noavg" ] && echo -en "\r\033[K" + [ "${avgdays}" != "noavg" ] && echo -en "\r\033[K" echo -e "${idsCL[LightCyan]} ${sensorname}${spc}${idsCL[Default]}: ${reading}" ((t++)) @@ -91,7 +91,7 @@ CHECKTEMP(){ fi else - [ "${1}" != "noavg" ] && echo -en "${idsCL[Yellow]}Pulling data and calculating averages for '${SENSOR}' ..." || echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ..." + [ "${avgdays}" != "noavg" ] && echo -en "${idsCL[Yellow]}Pulling data and calculating averages for '${SENSOR}' ..." || echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ..." reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${1}) c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done echo -e "\r\033[K${idsCL[LightCyan]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"