From a6472a4bb77668e99f4a99b1fc18dca3dcc60fb6 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 13 Dec 2023 18:50:58 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 9ebf69b8..5f2f0f64 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -558,7 +558,7 @@ CHECKPOWER(){ esac shift 1 done - [ "${avgdays}" = "0" ] && unset avgdays + [ "${avgdays}" == "0" ] && unset avgdays [ "${avgdays}" != "" ] && avgdayshdr="${avgdays}-Day-Avg" || avgdayshdr="" if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]) && [ "${PTYPE}" != "esxi" ]; then @@ -1173,16 +1173,16 @@ STARTALL_SERVICES(){ echo } SERVICE_MNG(){ - if [ "${2}" = "start" ]; then + if [ "${2}" == "start" ]; then sa=Starting - elif [ "${2}" = "stop" ]; then + elif [ "${2}" == "stop" ]; then sa=Stopping - elif [ "${2}" = "restart" ]; then + elif [ "${2}" == "restart" ]; then sa=Restarting - elif [ "${2}" = "status" ]; then + elif [ "${2}" == "status" ]; then sa='Status for' fi @@ -2377,7 +2377,10 @@ fi get-snapshots) GET_SNAPSHOTS;; service) - if [ "${2}" = "all" ]; then + if [ "${2}" == "status" ]; then + CHECK_SERVICES + + elif [ "${2}" == "all" ]; then if [ "${3}" == "stop" ]; then STOPALL_SERVICES elif [ "${3}" == "start" ]; then @@ -2388,40 +2391,40 @@ fi CHECK_SERVICES fi else - if [ "${3}" = "start" ] || [ "${3}" = "" ]; then + if [ "${3}" == "start" ] || [ "${3}" == "" ]; then echo "start: ${1}" - if [ "${2}" = "temp" ]; then + if [ "${2}" == "temp" ]; then # SENDNOTICE "Temp Monitor Startup" "$(DAILYTEMP)" & CHECKTEMP_SERVICE - elif [ "${2}" = "power" ]; then + elif [ "${2}" == "power" ]; then CHECKPOWER_SERVICE - elif [ "${2}" = "powerlogger" ]; then + elif [ "${2}" == "powerlogger" ]; then POWERLOGGER_SERVICE fi - elif [ "${3}" = "stop" ]; then - if [ "${2}" = "temp" ]; then + elif [ "${3}" == "stop" ]; then + if [ "${2}" == "temp" ]; then STOP_SERVICE temp for SENSOR in ${!PW_SENSOR_ID[@]}; do logtemp=${PW_LOGFOLDER}/log-temp-${SENSOR} echo "(`date +'%Y-%m-%d %H:%M:%S'`) - ${SENSOR} - Service Stopped" >> ${logtemp} done - elif [ "${2}" = "power" ]; then + elif [ "${2}" == "power" ]; then STOP_SERVICE power echo "(`date +'%Y-%m-%d %H:%M:%S'`) Service Stopped" >> ${PW_LOGPOWER} - elif [ "${2}" = "powerlogger" ]; then + elif [ "${2}" == "powerlogger" ]; then STOP_SERVICE powerlogger fi - elif [ "${3}" = "restart" ]; then + elif [ "${3}" == "restart" ]; then SERVICE_MNG ${2} stop sleep 2s SERVICE_MNG ${2} start - elif [ "${3}" = "status" ]; then + elif [ "${3}" == "status" ]; then srvc=${PW_POWERWALL_SERVICES[${2}]} c=0; spc=''; spc1=`expr 25 - ${#srvc}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done echo -e "${idsCL[LightCyan]}${srvc}${spc}: "