From 0377fbfffde49909da030b9fd8103ce0e88dd0b8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 27 Dec 2023 09:42:03 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index cac68f74..6587ad2f 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -84,7 +84,18 @@ CHECKTEMP(){ c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}" - [ "${avgdays}" != "noavg" ] && echo -en "Pulling data and calculating ${avgdays} Day average ... " || echo -en "Pulling data ... " + if [ "${avgdays}" != "noavg" ]; then + if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then + avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24")) Hour" + elif [ $(bc -l <<< "${avgdays} = 1") -eq 1 ]; then + avgdays_disp="${avgdays} Day" + else + avgdays_disp="${avgdays} Days" + fi + echo -en "Pulling data and calculating ${avgdays} Day average ... " + else + echo -en "Pulling data ... " + fi reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays}) echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${idsCL[Default]}" else