From b1a4ac64ada90934d96d7bac468af5dcd5d46697 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 28 Jan 2024 17:25:18 -0600
Subject: [PATCH] Update temp.inc.sh

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

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 98df4120..219ec817 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -44,11 +44,13 @@ CHECKTEMP(){
 	fi
 	echo
 	if [ "${avgdays}" != "" ]; then
-		if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then
-			avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0)Min"
-		elif [ $(bc -l <<< "${avgdays} < 10") -eq 1 ]; then
-			avgdays_disp=" ${avgdays}Day"
-		else
+		if [[ "${avgdays^^}" = *"M"* ]]; then
+			avgdays_disp="${avgdays::-1}Min"
+		elif [[ "${avgdays^^}" = *"H"* ]]; then
+			avgdays_disp="${avgdays::-1}Hrs"
+		elif [[ "${avgdays^^}" = *"D"* ]]; then
+			avgdays_disp="${avgdays::-1}Day"
+		elif [[ "${avgdays}" =~ ^[0-9]+$ ]]; then
 			avgdays_disp="${avgdays}Day"
 		fi
 		echo -e "${idsCL[Cyan]}Sensor Temperature(s)               Current / ${idsCL[LightYellow]}${avgdays_disp}AVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
@@ -139,10 +141,14 @@ CHECKTEMP(){
 				if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then
 					echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}"
 					if [ "${avgdays}" != "noavg" ]; then
-						if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then
-							avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0) Minute"
-						else
-							avgdays_disp="${avgdays} Day"
+						if [[ "${avgdays^^}" = *"M"* ]]; then
+							avgdays_disp="${avgdays::-1} Minute"
+						elif [[ "${avgdays^^}" = *"H"* ]]; then
+							avgdays_disp="${avgdays::-1} Hour"
+						elif [[ "${avgdays^^}" = *"D"* ]]; then
+							avgdays_disp="${avgdays::-1} Day"
+						elif [[ "${avgdays}" =~ ^[0-9]+$ ]]; then
+							avgdays_disp="${avgdays::-1} Day"
 						fi
 						echo -en "Pulling data and calculating ${avgdays_disp} average ... "
 					else
@@ -314,8 +320,19 @@ AVERAGETEMP(){
 		WHERE="sensorid=${sensorid} AND entity=${entityid}"
 	else
 		WHERE="sensorid=${sensorid}"
+	fi	
+	
+	if [[ "${daysback^^}" = *"M"* ]]; then
+		interval="${avgdays::-1} MINUTE"
+	elif [[ "${daysback^^}" = *"H"* ]]; then
+		interval="${avgdays::-1} HOUR"
+	elif [[ "${daysback^^}" = *"D"* ]]; then
+		interval="${avgdays::-1} DAY"
+	elif [[ "${daysback}" =~ ^[0-9]+$ ]]; then
+		interval="${avgdays} DAY"
 	fi
-	[ $(bc -l <<< "${daysback} < 1") -eq 1 ] && interval="$(ROUND_NUMBER $(bc <<< "scale=2; ${daysback}*24*60")) HOUR" || interval="${daysback} MINUTE"	
+	
+	
 	while IFS=$'\t' read date temp hum speed ;do
 		if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then
 			temptotal=$(bc <<< "scale=2; ${temptotal}+${speed}")