From 540877f02b6da3a0dc70207d7963e6e1710febbd Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 3 Dec 2023 13:44:12 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 4a716da4..1eab0caf 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1615,14 +1615,21 @@ PDUCONTROL(){ [ "${PORTSEL^^}" == "E" ] && exit 0 portsel_power=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.${PORTSEL} -O vq 2> /dev/null | sed -e 's/"//g') - [ ${portsel_power} -eq 2 ] && portsel_power_disp="${idsCL[Green]}ON" || portsel_power_disp="${idsCL[LightRed]}OFF" + [ ${portsel_power} -eq 1 ] && portsel_power_disp="${idsCL[Green]}ON" || portsel_power_disp="${idsCL[LightRed]}OFF" + [ ${portsel_power} -eq 2 ] && portsel_change_power_disp="${idsCL[Green]}ON" || portsel_change_power_disp="${idsCL[LightRed]}OFF" - echo -en "${idsCL[LightCyan]}Are you sure you wish to turn ${portsel_power_disp}${idsCL[LightCyan]} port ${idsCL[Yellow]}${PORTSEL}${idsCL[Default]} (y/N): " + if [ "${PORT_SEL}" != "" ]; then + portdesc=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.2.${PORT_SEL} -O vq 2> /dev/null | sed -e 's/"//g') + c=0; spc=''; spc1=`expr 28 - ${#portdesc}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done + echo -e "${idsCL[LightCyan]}${portdesc}${spc}${idsCL[Default]}: ${portsel_power_disp}${idsCL[Default]}\n" + fi + + echo -en "${idsCL[LightCyan]}Are you sure you wish to turn ${portsel_change_power_disp}${idsCL[LightCyan]} port ${idsCL[Yellow]}${PORTSEL}${idsCL[Default]} (y/N): " read -n 1 portchange_confirm case "${portchange_confirm}" in [Yy]) [ ${portsel_power} -eq 1 ] && portsel_change=2 || portsel_change=1 - echo -en "\n\n${idsCL[LightCyan]}Turning ${portsel_power_disp}${idsCL[LightCyan]} port ${idsCL[Yellow]}${PORTSEL}${idsCL[Default]} ... " + echo -en "\n\n${idsCL[LightCyan]}Turning ${portsel_change_power_disp}${idsCL[LightCyan]} port ${idsCL[Yellow]}${PORTSEL}${idsCL[Default]} ... " run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.${PORTSEL} i ${portsel_change} >/dev/null 2>&1) echo -e "${idsCL[Green]}Done${idsCL[Default]}" echo