From b4382e488cf95f81d694d10fd93363ad2500514e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 17 Dec 2023 20:22:18 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index d66ba00c..c51a405f 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -630,7 +630,8 @@ SERVERROOM_TEMP_DIFFERENCE(){ last_tempdiff=$(tail -n 1 ${PW_TMPFOLDER}/.log.sr.difference) last_tempdiff=${last_tempdiff#*~} - if [ $(bc -l <<< "${last_tempdiff} < 1") -eq 1 ]; then [ "${last_tempdiff}" = "0" ] && last_tempdiff="0.0" || last_tempdiff="0${last_tempdiff}"; fi + # if [ $(bc -l <<< "${last_tempdiff} < 1") -eq 1 ]; then [ "${last_tempdiff}" = "0" ] && last_tempdiff="0.0" || last_tempdiff="0${last_tempdiff}"; fi + last_tempdiff=`IDS_NUMBER_FORMAT ${last_tempdiff} 2` tempdiffs=$(tail -n ${LAST} ${PW_TMPFOLDER}/.log.sr.difference) largest_tempdiff=0 IFS=$'\n' @@ -643,10 +644,12 @@ SERVERROOM_TEMP_DIFFERENCE(){ tempdiff_total=$(bc <<< "scale=2; ${tempdiff_total}+${tempdiff}") ((scansfound++)) done - if [ $(bc -l <<< "${largest_tempdiff} < 1") -eq 1 ]; then [ "${largest_tempdiff}" = "0" ] && largest_tempdiff="0.0" || largest_tempdiff="0${largest_tempdiff}"; fi + # if [ $(bc -l <<< "${largest_tempdiff} < 1") -eq 1 ]; then [ "${largest_tempdiff}" = "0" ] && largest_tempdiff="0.0" || largest_tempdiff="0${largest_tempdiff}"; fi + largest_tempdiff=`IDS_NUMBER_FORMAT ${largest_tempdiff} 2` [ ${scansfound} -eq 0 ] && average=0 || average=$(bc <<< "scale=2; ${tempdiff_total}/${scansfound}") - if [ $(bc -l <<< "${average} < 1") -eq 1 ]; then [ "${average}" = "0" ] && average="0.0" || average="0${average}"; fi + # if [ $(bc -l <<< "${average} < 1") -eq 1 ]; then [ "${average}" = "0" ] && average="0.0" || average="0${average}"; fi + average=`IDS_NUMBER_FORMAT ${average} 2` [ -f ${PW_TMPFOLDER}/.log.sr.difference ] && last_scancheck=$(date -d @$(stat -c %Y ${PW_TMPFOLDER}/.log.sr.difference) "+%Y-%m-%d %H:%M:%S") || last_scancheck="" @@ -678,7 +681,8 @@ SERVERROOM_TEMP_DIFFERENCE(){ if [[ "${tempdiff}" = *"~"* ]]; then dt="${tempdiff%~*}" tempdiff=${tempdiff#*~} - if [ $(bc -l <<< "${tempdiff} < 1") -eq 1 ]; then [ "${tempdiff}" = "0" ] && tempdiff="0.0" || tempdiff="0${tempdiff}"; fi + # if [ $(bc -l <<< "${tempdiff} < 1") -eq 1 ]; then [ "${tempdiff}" = "0" ] && tempdiff="0.0" || tempdiff="0${tempdiff}"; fi + tempdiff=`IDS_NUMBER_FORMAT ${tempdiff} 2` else dt=" " fi