diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index bd4608bd..02a119a8 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -171,11 +171,8 @@ CHECKTEMPSENSOR(){ [ ${#temp_warn} == 2 ] && spcw=' ' || spcw=' ' [ ${#temp_crit} == 2 ] && spcc=' ' || spcc=' ' echo -e "${spc}[${spcw}${idsCL[Yellow]}${temp_warn}${GAUGESH}${idsCL[Default]} /${spcc}${idsCL[LightRed]}${temp_crit}${GAUGESH}=>${idsCL[Default]} ]" - - if [ "${1}" == "ServerRoomTH" ]; then - export ServerRoomTH=${temp_f} - - elif [ "${1}" == "ServerRoomLA" ]; then + + if [ "${1}" == "ServerRoomLA" ]; then temp_probe_f=$(bc <<< "scale=2; ${temp_probe_c}*1.8+32") tmp="${spct}${temp_probe_f}" c=0; spc=''; spc1=`expr 10 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done @@ -203,13 +200,9 @@ CHECKTEMPSENSOR(){ [ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal ${spct}${temp_probe_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal ${spct}${temp_probe_f}${GAUGESH}${idsCL[Default]}" fi # [ "${average}" != "" ] && echo -en ' ' - echo -en "${spc}[${spcw}${idsCL[Yellow]}${temp_warn}${GAUGESH}${idsCL[Default]} /${spcc}${idsCL[LightRed]}${temp_crit}${GAUGESH}=>${idsCL[Default]} ]" + echo -e "${spc}[${spcw}${idsCL[Yellow]}${temp_warn}${GAUGESH}${idsCL[Default]} /${spcc}${idsCL[LightRed]}${temp_crit}${GAUGESH}=>${idsCL[Default]} ]" - temp_difference=$(bc <<< "scale=2; ${ServerRoomTH}-${temp_probe_f}") - echo "${idsCL[LightCyan]} - TempDiff = ${temp_difference}'F (${ServerRoomTH}-${temp_probe_f})${idsCL[Default]}" - fi - echo "HERE: ${ServerRoomTH}" fi } AVERAGETEMP(){