diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 21692051..0a5aca32 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -1611,7 +1611,7 @@ SENDTEMP(){ if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ] && ([ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ])); then SENSORS_CHECK=(${SENSORa}) for SENSOR in "${SENSORS_CHECK[@]}"; do - echo "HERE: ${SENSOR} - ${SENSORa} ~ ${PW_DESC_TEMP[${SENSOR}]}" + # echo "HERE: ${SENSOR} - ${SENSORa} ~ ${PW_DESC_TEMP[${SENSOR}]}" if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then GAUGESH="'%" elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then @@ -1698,8 +1698,6 @@ SENDTEMP(){ if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then - [ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR} - c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR_DESC}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done if [ "${SENSOR}" == "ServerRoomTH" ]; then temp_f=`echo "scale=2; (${temp_c}*(9/5))+32+${PW_ServerRoomTH_Dev}" | tr -d $'\r' | bc` else @@ -1732,14 +1730,15 @@ SENDTEMP(){ average7_disp=$(IDS_NUMBER_FORMAT ${average7} 2 yes) fi - + [ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR} + c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR_DESC}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done [ "${1}" != "" ] && echo -e "${SENSOR_DESC}${spc}${temp_f_disp}${GAUGESH} / ${average1_disp}${GAUGESH} / ${average7_disp}${GAUGESH}" || echo -e "${SENSOR_DESC}${spc}${temp_f_disp}${GAUGESH} (${cw} - ${#SENSOR_DESC} = ${spc1})" else echo -e "${SENSOR_DESC}${spc}No Data" fi - last_sensor=${SENSORa} + last_sensor=${SENSOR} done fi