diff --git a/powerwall.sh b/powerwall.sh index d697876f..0347963c 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -591,7 +591,8 @@ CHECKPOWER(){ echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT} W${idsCL[Default]}" echo - until [ "${checked}" != "" ]; do + finalcheck="" + until [ "${finalcheck}" != "" ]; do for hostfile in ${PW_TMPFOLDER}/*.hostpower; do if [ -f ${hostfile} ] && [ "${hostfile}" != "${PW_TMPFOLDER}/*.hostpower" ]; then host=${hostfile%.*}; host=${host##*/} @@ -605,7 +606,7 @@ CHECKPOWER(){ mv ${hostfile} ${hostfile}.done elif [ "${host}" == "done" ]; then - checked=done + finalcheck=done rm -f ${PW_TMPFOLDER}/*.hostpower* fi fi @@ -640,7 +641,7 @@ CHECKPOWER_SERVICE(){ if [ $voltstatus -eq 3 ]; then echo "($datetime) - ${INPUTACV}V - Back to Normal Voltage" >> ${PW_LOGPOWER} SENDNOTICE "POWER NOMINAL AGAIN" "($datetime) Normal voltage detected - VOLTAGE: ${INPUTACV}V" +VOLTAGE: ${INPUTACV}V" echo -e "($datetime) - ${INPUTACV}V - POWER NOMINAL AGAIN" >> ${PW_LOGFILE} battstatus=0 else @@ -648,9 +649,9 @@ CHECKPOWER_SERVICE(){ [ $errtime -ge 3600 ] && echo "($datetime) - ${INPUTACV}V - Normal Voltage" >> ${PW_LOGPOWER} if [ $voltstatus -eq 0 ]; then SENDNOTICE "Power Nominal" "($datetime) Service Startup - Normal voltage detected - VOLTAGE: ${INPUTACV}V - BATT VOLTAGE: ${BATTVOLT}V" +Normal voltage detected +VOLTAGE: ${INPUTACV}V +BATT VOLTAGE: ${BATTVOLT}V" echo "($datetime) - Input: ${INPUTACV}V - Service Startup - Normal voltage detected" >> ${PW_LOGPOWER} echo -e "($datetime) - ${INPUTACV}V / ${BATTVOLT}V - Service Startup - Normal Voltage" >> ${PW_LOGFILE} fi @@ -662,8 +663,8 @@ CHECKPOWER_SERVICE(){ echo -e "($datetime) - ${INPUTACV}V - POWER OFF/LOW POWER" >> ${PW_LOGFILE} if [ $voltstatus -lt 3 ]; then SENDNOTICE "POWER ALERT - POWER OFF/LOW POWER!!" "($datetime) Power off or low voltage detected - VOLTAGE: ${INPUTACV}V - BATT VOLTAGE: ${BATTVOLT}V" 1 +VOLTAGE: ${INPUTACV}V +BATT VOLTAGE: ${BATTVOLT}V" 1 last_battvolt=$BATTVOLT fi voltstatus=3 @@ -677,7 +678,7 @@ CHECKPOWER_SERVICE(){ if [ $battstatus -lt 2 ] && [ ${INPUTACV} -lt ${min_acvolt} ]; then echo "($datetime) - ${BATTVOLT}V - Shutting down main servers..." >> ${PW_LOGPOWER} SENDNOTICE "BATT-VOLT LOW: SHUTDOWN MAIN SERVERS" "($datetime) Battery Voltage LOW: ${BATTVOLT}V - Shutting down main servers" 1 +Shutting down main servers" 1 SHUTDOWN_MAIN power & battstatus=2 fi @@ -689,7 +690,7 @@ CHECKPOWER_SERVICE(){ if [ $battstatus -lt 3 ] && [ ${INPUTACV} -lt ${min_acvolt} ]; then echo "($datetime) - ${BATTVOLT}V - Shutting down all remaining servers..." >> ${PW_LOGPOWER} SENDNOTICE "BATT-VOLT REALLY LOW: SHUTDOWN SYS SERVERS" "($datetime) Battery Voltage REALLY LOW: ${BATTVOLT}V - Shutting down all servers" 1 +Shutting down all servers" 1 SHUTDOWN_SYS power & battstatus=3