From bf7232dafbacf96ee4541223db2cdfa6fd9f89a8 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 17 Dec 2023 00:11:58 -0600
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index e258dfdc..05350316 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -179,29 +179,20 @@ CHECKTEMPSENSOR(){
 			[ ${#temp_warn} == 2 ] && spcw='  ' || spcw=' '
 			[ ${#temp_crit} == 2 ] && spcc='  ' || spcc=' '
 			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
-				echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}"
-			else
-				echo -en "${idsCL[Green]}Normal  ${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}"
-			fi
-			# [ "${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
+			if [ $(bc -l <<< "${temp_probe_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_probe_f} < ${temp_crit}") -eq 1 ]; then
+				[ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_probe_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}"
+			elif [ $(bc -l <<< "${temp_probe_f} >= ${temp_crit}") -eq 1 ]; then
+				[ "${average}" != "" ] && echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_probe_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}"
+			else
+				[ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal  ${spct}${temp_probe_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || 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]} ]"
+
 		fi
 		
 	fi