From f6e7694ae79102431704e7cf6e94bedc15af36ce Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 29 Apr 2024 10:31:18 -0500
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 59ef264c..e2f1b2df 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -124,27 +124,30 @@ CHECKTEMP(){
 							lclr="${idsCL[Green]}"
 							lmd="Normal  "
 						fi
+						c=0; spct=''; [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && spc1=`expr 6 - ${#temp_f}` || spc1=`expr 7 - ${#temp_f}`
+						until [ ${c} = ${spc1} ]; do spct="${spct} "; ((c++)); done
+						reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}"
+						echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} "
 						
 						if [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then
-							lookback=''
 							for R in ${PW_TEMPIND_RANGE[@]}; do
 								OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
 								if [ "${OLD_temp_f[1]}" != "" ]; then
 									if [ $(bc -l <<< "${temp_f} <  $(echo "scale=2; ${OLD_temp_f[1]}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f[1]}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then
-										lookback="${lookback}${idsCL[White]}\u23F9 "
+										echo -en "${idsCL[White]}\u23F9 "
 									elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD_temp_f[1]}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then
-										lookback="${lookback}${idsCL[LightRed]}\u25B2 "
+										echo -en "${idsCL[LightRed]}\u25B2 "
 									elif [ $(bc -l <<< "${OLD_temp_f[1]} < ${temp_f}") -eq 1 ]; then
-										lookback="${lookback}${idsCL[Magenta]}\u25B2 "
+										echo -en "${idsCL[Magenta]}\u25B2 "
 									elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD_temp_f[1]}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then
-										lookback="${lookback}${idsCL[LightGreen]}\u25BC "
+										echo -en "${idsCL[LightGreen]}\u25BC "
 									elif [ $(bc -l <<< "${temp_f} < ${OLD_temp_f[1]}") -eq 1 ]; then
-										lookback="${lookback}${idsCL[LightCyan]}\u25BC "
+										echo -en "${idsCL[LightCyan]}\u25BC "
 									else
-										lookback="${lookback}  "
+										echo -en "  "
 									fi
 								else
-									lookback="${lookback}${idsCL[Default]}\u22C5 "
+									echo -en "${idsCL[Default]}\u22C5 "
 								fi
 							done
 						elif [ "${avgdays}" = "noavg" ]; then
@@ -152,12 +155,6 @@ CHECKTEMP(){
 							echo -en "    "
 						fi
 						
-						c=0; spct=''; [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && spc1=`expr 6 - ${#temp_f}` || spc1=`expr 7 - ${#temp_f}`
-						until [ ${c} = ${spc1} ]; do spct="${spct} "; ((c++)); done
-						reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}"
-						echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} "
-						[ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]] && echo -en "${lookback}"
-						
 					else
 						temp_f_disp="    "
 						lclr="${idsCL[Yellow]}"