From c61d5d787dec7001ceb5f705a04b12175bfd396e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 22 Dec 2023 19:50:52 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 8d25bac9..93f511fd 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -71,20 +71,19 @@ CHECKTEMP(){ # fi fi echo - - elif [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && [ "${temptype}" != "esxi" ]; then - [[ "${SENSOR}" == *"CPU-Usage"* ]] && echo -en "\033[1A" - c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done - if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then - echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}" - [ "${avgdays}" != "noavg" ] && echo -en "Pulling data and calculating ${avgdays} Day average ... " || echo -en "Pulling data ... " - reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays}) - echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${idsCL[Default]}" - else - echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}Sensor Offline${idsCL[Default]}" - fi - echo + fi + if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && [ "${temptype}" != "esxi" ]; then + [[ "${SENSOR}" == *"CPU-Usage"* ]] && echo -en "\033[1A" + c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done + if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then + echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}" + [ "${avgdays}" != "noavg" ] && echo -en "Pulling data and calculating ${avgdays} Day average ... " || echo -en "Pulling data ... " + reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays}) + echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${idsCL[Default]}" + else + echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}Sensor Offline${idsCL[Default]}" fi + echo fi fi done