From bde7a2c084a630af16db549781865e4871a541b1 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 7 Nov 2023 07:58:41 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 6adca4e7..0cd8fe83 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -537,14 +537,17 @@ CHECKPOWER(){ while [ $# -gt 0 ]; do case "$1" in -avg) avgdays=${2};; + hosts) PTYPE=hosts + mainsite) PTYPE=mainsite + offsite) PTYPE=offsite esac shift done - echo "HERE2: ${1}" + echo "HERE2: ${PTYPE}" [ "${avgdays}" = "0" ] && unset avgdays [ "${avgdays}" != "" ] && avgdayshdr="${avgdays}-Day-Avg" || avgdayshdr="" - if [ "${1}" == "" ] || [ "${1}" == "all" ] || [ "${1}" == "mainsite" ]; then + if [ "${PTYPE}" == "" ] || [ "${PTYPE}" == "all" ] || [ "${PTYPE}" == "mainsite" ]; then echo DIVIDER . yellow 75 echo -e "${idsCL[Yellow]}Mainsite Power Information ${avgdayshdr}" @@ -641,7 +644,7 @@ CHECKPOWER(){ fi - if [ "${1}" == "" ] || [ "${1}" == "all" ] || [ "${1}" == "offsite" ]; then + if [ "${PTYPE}" == "" ] || [ "${PTYPE}" == "all" ] || [ "${PTYPE}" == "offsite" ]; then DIVIDER . yellow 75 @@ -699,7 +702,7 @@ CHECKPOWER(){ for SENSOR in ${PW_SENSOR_ORD[@]}; do if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then gochk=0 - if [ "${1}" == "" ] || [ "${1}" == "hosts" ] || ([ "${1}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${1}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then + if [ "${PTYPE}" == "" ] || [ "${PTYPE}" == "hosts" ] || ([ "${PTYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${PTYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then gochk=1 fi if [ ${gochk} -eq 1 ]; then