From b40944aade975dee46f9dfe5c3a2e84830a5241f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 9 Apr 2024 14:10:37 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/temp.inc.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 77a2a61f..4cf48fdf 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.74-04072024' +VERS='2.6.75-04092024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index e81008a0..c1015448 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -288,10 +288,10 @@ CHECKTEMP(){ c=0; spca=''; spc1=`expr 6 - ${#average_disp}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done if [ "${average_disp}" == "" ]; then averagedisp="${idsCL[Green]}" - elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then - averagedisp="${idsCL[Yellow]}${average}" - elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then + elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ] || ([ "${TTYPE}" == "fans" ] && [ $(bc -l <<< "${average} > $(bc <<< "scale=2; ${GL_HIGH}+5")") -eq 1 ]); then averagedisp="${idsCL[LightRed]}${average_disp}" + elif ([ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]) || ([ "${TTYPE}" == "fans" ] && [ $(bc -l <<< "${average} < ${GL_LOW}") -eq 1 ]); then + averagedisp="${idsCL[Yellow]}${average}" else averagedisp="${idsCL[Green]}${average_disp}" fi