diff --git a/defaults.inc b/defaults.inc index 2b8accc2..b1e12126 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.35-02162024' +VERS='2.6.36-02162024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 0f9d1cd3..4b4ab9d7 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -51,8 +51,6 @@ AVERAGEPOWER(){ } CHECKPOWER(){ - modstart=`date +%s` - echo "START: ${modstart}" rm -f ${PW_TMPFOLDER}/*.hostpower* REPORT=0 wspc=10 @@ -74,6 +72,7 @@ CHECKPOWER(){ shift 1 done if [ "${avgdays}" != "" ]; then + [ ${REPORT} -eq 0 ] && modstart=`date +%s` if [ "${avgdays}" = "0" ]; then unset avgdays elif [[ "${avgdays^^}" = *"M"* ]]; then @@ -523,11 +522,9 @@ CHECKPOWER(){ fi fi if [ ${REPORT} -eq 0 ]; then - if [ "${avgdays}" != "" ] && [ ${REPORT} -eq 0 ]; then + if [ "${avgdays}" != "" ]; then modend=`date +%s`; modruntime=$((modend-modstart)); echo -e "${idsCL[Default]}runtime: ${modruntime}s" - echo "END: ${modend}" fi - [ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}" fi }