diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 94798202..e15fd8f6 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -169,15 +169,16 @@ CHECKTEMPSENSOR(){ until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done if [ "${average}" != "" ]; then - c=0; spca=''; spc1=`expr 6 - ${#average}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done - if [ "${average}" == "" ]; then + ([ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]]) && average_disp=$(IDS_NUMBER_FORMAT ${average} 2 yes) || average_disp=${average} + 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 - averagedisp="${idsCL[LightRed]}${average}" + averagedisp="${idsCL[LightRed]}${average_disp}" else - averagedisp="${idsCL[Green]}${average}" + averagedisp="${idsCL[Green]}${average_disp}" fi fi @@ -192,11 +193,11 @@ CHECKTEMPSENSOR(){ fi if [ $(bc -l <<< "${temp_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_f} < ${temp_crit}") -eq 1 ]; then - [ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" + [ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f_disp}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" elif [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ]; then - [ "${average}" != "" ] && echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" + [ "${average}" != "" ] && echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f_disp}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" else - [ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal ${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" + [ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal ${spct}${temp_f_disp}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" fi tmp="${spct}${temp_f_disp}${GAUGESH}"