From db734a18ab1ff9717e7fd182b60d82c6d11bae8f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 9 May 2024 21:45:40 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index e4b5f44b..fb21ac41 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -86,7 +86,7 @@ CHECKTEMP(){ DIVIDER . yellow ${PRI_WIDTH} for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${search}" == "" ] || ([[ "${SENSOR,,}" = *"${search,,}"* ]] && [[ "${SENSOR,,}" != *"${exclude,,}"* ]]) || ([[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]] && [[ "${PW_DESC_TEMP[${SENSOR}],,}" != *"${exclude,,}"* ]])) && ([ "${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 + if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${search}" == "" ] || ([[ "${SENSOR,,}" = *"${search,,}"* ]] && [[ "${SENSOR,,}" != *"${exclude,,}"* ]]) || [[ "${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 @@ -279,7 +279,7 @@ CHECKTEMP(){ fi DIVIDER . yellow ${PRI_WIDTH} for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && ([ "${search}" == "" ] || ([[ "${SENSOR,,}" = *"${search,,}"* ]] && [[ "${SENSOR,,}" != *"${exclude,,}"* ]]) || ([[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]] && [[ "${PW_DESC_TEMP[${SENSOR}],,}" != *"${exclude,,}"* ]])) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then + if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && ([ "${search}" == "" ] || ([[ "${SENSOR,,}" = *"${search,,}"* ]] && [[ "${SENSOR,,}" != *"${exclude,,}"* ]]) || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]} vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]} vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTiDRACIP}]}