From fc380a249ed12f6961dad6898fe35636d80d6444 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 27 Dec 2023 09:29:16 -0600
Subject: [PATCH] Update temp.inc.sh

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

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 14fc51dc..ae1a6b57 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -12,7 +12,7 @@ CHECKTEMP(){
 	done
 	echo
 	if [ "${avgdays}" != "" ]; then
-		[ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
+		[ $(bc -l <<< "${avgdays} < 10") -eq 1 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
 		echo -e "${idsCL[Cyan]}Sensor Temperature(s)               Current / ${idsCL[LightYellow]}${avgdays_disp}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
 	else
 		avgdays=noavg
@@ -268,6 +268,12 @@ AVERAGETEMP(){
 	else
 		WHERE="sensorid=${sensorid}"
 	fi
+	if [ $(bc -l <<< "${daysback} < 1") -eq 1 ]; then
+		interval="$(ROUND $(bc <<< "scale=2; ${daysback}*24")) HOUR"
+	else
+		interval="${daysback} DAY"
+	fi
+	
 		
 	while IFS=$'\t' read date temp hum speed ;do
 		if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then
@@ -276,7 +282,7 @@ AVERAGETEMP(){
 			temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}")
 		fi
 		((logsfound++))
-	done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
+	done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
 	if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then
 		# average=$(bc <<< "scale=0; ${temptotal}/${logsfound}")
 		average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}"))