From a31d996d7414cc9360e99b2a5a9a030d38fe6a28 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 4 Nov 2023 11:48:33 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 8e7f3d62..d72b7d95 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -19,10 +19,14 @@ CHECKTEMP(){
 	start=`date +%s`
 	cw=25;
 	echo
-	[ "${1}" != "" ] && [ "${1}" != "noavg" ] && [[ "${1}" =~ ^[0-9]+$ ]] && avgdays=${1} || avgdays=3
-	[ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
-	# echo -e "${idsCL[Yellow]}Sensor Temperature(s)                            ${idsCL[Green]}normal${idsCL[Default]} /${idsCL[Yellow]}warning${idsCL[Default]}/ ${idsCL[Red]}critical${idsCL[Default]}"
-	echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / ${avgdays_disp}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
+	
+	if [ "${1}" != "noavg" ]; then
+		[ "${1}" != "" ] && [[ "${1}" =~ ^[0-9]+$ ]] && avgdays=${1} || avgdays=3
+		[ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
+		echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / ${avgdays_disp}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
+	else
+		echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current    ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
+	fi
 	DIVIDER . yellow 90
 		
 	for SENSOR in ${PW_SENSOR_ORD[@]}; do
@@ -150,16 +154,14 @@ CHECKTEMPSENSOR(){
 			else
 				averagedisp="${idsCL[Green]}${average}'F"
 			fi
-		else
-			averagedisp='        '
 		fi
 		
 		if [ $(bc -l <<< "${temp_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_f} < ${temp_crit}") -eq 1 ]; then
-			echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Yellow]})${idsCL[Default]}"
+			[ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Yellow]})${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F${idsCL[Yellow]})${idsCL[Default]}"
 		elif [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ]; then
-			echo -en "${idsCL[Red]}CRITICAL (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Red]})${idsCL[Default]}"
+			[ "${average}" != "" ] && echo -en "${idsCL[Red]}CRITICAL (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Red]})${idsCL[Default]}" || echo -en "${idsCL[Red]}CRITICAL (${spct}${temp_f}'F)${idsCL[Default]}"
 		else
-			echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Green]})${idsCL[Default]}"
+			[ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Green]})${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F)${idsCL[Default]}"
 		fi
 		tmp="${spct}${temp_f}"
 		c=0; spc=''; spc1=`expr 9 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done