diff --git a/powerwall.sh b/powerwall.sh index 7edef100..35f89a30 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -756,18 +756,11 @@ CHECKPOWER(){ elif [[ "${DP}" = *"PS1"* ]]; then PS1=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //') - [ "${PS1}" == "" ] && PS1=0 || PS1=`echo "scale=1; ${PS1}/10" | bc`; (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}" elif [[ "${DP}" = *"PS2"* ]]; then PS2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //') - if [ "${PS2}" == "" ]; then - PS2=0 - echo 'yes' - else - echo 'no' - PS2=`echo "scale=1; ${PS2}/10" | bc` - (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}" - fi fi + [ "${PS1}" == "" ] && PS1=0 || PS1=`echo "scale=1; ${PS1}/10" | bc`; (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}" + [ "${PS2}" == "" ] && PS2=0 || PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}" done if [ ${found} -eq 1 ]; then [[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${HOST_WATTS}`'watts"