diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 3aa964ee..8bceea93 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -73,7 +73,7 @@ CHECKTEMP(){ avgdays=noavg fi - if [ "${TTYPE}" != "esxi" ]; then + if [ "${TTYPE}" != "esxi" ] && [ "${TTYPE}" != "fans" ]; then DIVIDER . yellow ${PRI_WIDTH} if [ "${avgdays}" != "noavg" ]; then echo -e "${idsCL[LightYellow]}SENSOR TEMPERATURE(S) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG${spchdr}${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}" @@ -83,7 +83,7 @@ CHECKTEMP(){ DIVIDER . yellow ${PRI_WIDTH} for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${exclude}" == "" ] || [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]]) && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fansxxx" ] && ([[ "${SENSOR}" = *"Room"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}]}" = *"Room" ]]))); then + if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${exclude}" == "" ] || [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]]) && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && ([[ "${SENSOR}" = *"Room"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}]}" = *"Room" ]]))); then [ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR} if [ "${PW_THRESHOLDS[${SENSOR}]}" != "" ]; then echo ${PW_THRESHOLDS[${SENSOR}]} | cut -d',' -f 1 | read temp_warn