diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index e53ca07c..17240353 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -223,11 +223,10 @@ CHECKTEMP(){ lico=" " if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then OLD_temp_f=($(${mysql_conn} -e "SELECT speed FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) - OLD_temp_f=$(IDS_NUMBER_FORMAT ${OLD_temp_f[1]}) else OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) - OLD_temp_f=${OLD_temp_f[1]} fi + OLD_temp_f=${OLD_temp_f[1]} if [ "${OLD_temp_f}" != "" ]; then if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then lclr="${idsCL[White]}" @@ -256,7 +255,7 @@ CHECKTEMP(){ [ ${#M} -eq 2 ] && echo -n " " if [ "${OLD_temp_f}" != "" ]; then c=0; spc=''; spc1=`expr 7 - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -e "${lclr}~${M}m ago - ${lclr}${lico}${spc}${OLD_temp_f}${GAUGESH}" + echo -e "${lclr}~${M}m ago - ${lclr}${lico}${spc}$(IDS_NUMBER_FORMAT ${OLD_temp_f})${GAUGESH}" else echo -e "${lclr}~${M}m ago - ${lclr}${lico}" fi