From b9a430ea78c963c858ff65616222cd5020dd9c37 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 12 Jul 2025 09:49:56 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 4 ++-- inc/temp.inc.sh | 2 +- powerwall.sh | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/defaults.inc b/defaults.inc index 364a0cfc..41c85ac7 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.11.8-07122025' +PW_VERS='2.11.9-07122025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 08cec636..d1fbbc81 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -1362,7 +1362,7 @@ POWERLOGGER_SERVICE(){ read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}" unset IFS if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.disable ] || ([ -f ${PW_TMPFOLDER}/${SENSOR}.disable ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.disable)) -ge 120 ]); then - [ -f ${PW_TMPFOLDER}/shutdown.${SENSOR} ] && rm -f ${PW_TMPFOLDER}/shutdown.${SENSOR} + [ -f ${PW_TMPFOLDER}/${SENSOR}.shutdown ] && rm -f ${PW_TMPFOLDER}/${SENSOR}.shutdown [ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL [[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE @@ -1453,7 +1453,7 @@ POWERLOGGER_SERVICE(){ read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}" unset IFS if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.disable ] || ([ -f ${PW_TMPFOLDER}/${SENSOR}.disable ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.disable)) -ge 120 ]); then - [ -f ${PW_TMPFOLDER}/shutdown.${SENSOR} ] && rm -f ${PW_TMPFOLDER}/shutdown.${SENSOR} + [ -f ${PW_TMPFOLDER}/${SENSOR}.shutdown ] && rm -f ${PW_TMPFOLDER}/${SENSOR}.shutdown [ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL [[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index caf6b53f..f02b44a2 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -921,7 +921,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ SENDNOTICE "${SENSOR_DESC} Data" "${SENSORa} is reporting data again" echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} - Sensor is reporting data again" >> ${logtemp} fi - rm -f ${PW_TMPFOLDER}/*${SENSORa}* + rm -f ${PW_TMPFOLDER}/${SENSORa}* [ "${PW_ESXI_DEF_EXHAUST_MIN}" != "" ] && ESXI_DEFAULT_EXHAUST_MIN=${PW_ESXI_DEF_EXHAUST_MIN} [ "${SENSOR}" == "iDS-vMS-Host7" ] && ESXI_DEFAULT_EXHAUST_MIN=$(bc <<< "scale=2; ${ESXI_DEFAULT_EXHAUST_MIN}+${PW_ESXI_HOST7_FAN_DIFF}") GL_HIGH=$(bc <<< "scale=2; ${ESXI_DEFAULT_EXHAUST_MIN}+${ESXI_FANSPEED_GL_ZONE}") diff --git a/powerwall.sh b/powerwall.sh index 67e115bb..b03544db 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -500,11 +500,11 @@ SHUTDOWN_SERVER(){ fi [ "${ESXI_HOST}" != "${PW_MAIN_ISCSI}" ] && echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be shutdown momentarily ... \n" - touch ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} + touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.disable else echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be in maintenance mode momentarily ... \n" - touch ${PW_TMPFOLDER}/maintmode.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} + touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.maintmode fi ## DECREASE CPU OVERCOMMIT @@ -665,7 +665,7 @@ HOSTMGMT(){ elif [ "${MODE}" == "power" ]; then if [ ${MN} -eq 1 ]; then - [ -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} + [ -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown ] && rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown # if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]); then # HOSTPOWER ${PW_MAIN_ISCSI} on @@ -675,7 +675,7 @@ HOSTMGMT(){ var=PW_${ESXI_HOST}HOSTS[@]; v=1 for vhost in "${!var}"; do HOSTPOWER ${vhost} ${POWER} - [ -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${vhost}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${vhost}]} + [ -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${vhost}]}.shutdown ] && rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${vhost}]}.shutdown sleep 3s done @@ -693,7 +693,7 @@ HOSTMGMT(){ # fi else HOSTPOWER ${ESXI_HOST} ${POWER} - [ -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} + [ -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown ] && rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown fi fi echo