From 5ad044e7ea9e32865764f1702bf855e89ecff43c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 17 Dec 2023 00:07:19 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index b6300ac8..e258dfdc 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -178,7 +178,7 @@ CHECKTEMPSENSOR(){ c=0; spc=''; spc1=`expr 10 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done [ ${#temp_warn} == 2 ] && spcw=' ' || spcw=' ' [ ${#temp_crit} == 2 ] && spcc=' ' || spcc=' ' - echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}-Probe ${idsST[Reset]}${spc}${idsCL[Default]}: " + echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${1}-Probe ${idsST[Reset]}${spc}${idsCL[Default]}: " if [ $(bc -l <<< "${temp_probe_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_probe_f} < ${temp_crit}") -eq 1 ]; then echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}" elif [ $(bc -l <<< "${temp_probe_f} >= ${temp_crit}") -eq 1 ]; then @@ -186,8 +186,22 @@ CHECKTEMPSENSOR(){ else echo -en "${idsCL[Green]}Normal ${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}" fi - [ "${average}" != "" ] && echo -en ' ' - echo -e "${spc}[${spcw}${idsCL[Yellow]}${temp_warn}${GAUGESH}${idsCL[Default]} /${spcc}${idsCL[LightRed]}${temp_crit}${GAUGESH}=>${idsCL[Default]} ]" + # [ "${average}" != "" ] && echo -en ' ' + + if [ "${average}" != "" ]; then + average=$(AVERAGETEMP ${PW_SENSOR_ID["${1}-Probe"]} ${avgdays}) + c=0; spca=''; spc1=`expr 6 - ${#average}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done + if [ "${average}" == "" ]; then + echo -en "${idsCL[Green]}" + elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then + echo -en "${idsCL[Yellow]}${average}" + elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then + echo -en "${idsCL[LightRed]}${average}" + else + echo -en "${idsCL[Green]}${average}" + fi + + fi fi fi