From: Steven Baltakatei Sandoval Date: Fri, 10 Jul 2020 03:24:18 +0000 (+0000) Subject: style(unitproc):timeUntilNextHour: VAR_NAMES to VarNames X-Git-Tag: 0.3.0~32 X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/commitdiff_plain/0f6236dd3cfebde7f8c2c6086af62c04ea085b5a?ds=sidebyside style(unitproc):timeUntilNextHour: VAR_NAMES to VarNames --- diff --git a/unitproc/bktemp-timeUntilNextDay b/unitproc/bktemp-timeUntilNextDay index 6a8525c..ae7562a 100644 --- a/unitproc/bktemp-timeUntilNextDay +++ b/unitproc/bktemp-timeUntilNextDay @@ -8,14 +8,14 @@ die() { yell "$*"; exit 111; } try() { "$@" || die "cannot $*"; } timeUntilNextDay(){ # Desc: Report seconds until next day. - # Version: 1.0.2 + # Version: 1.0.3 # Output: stdout: integer seconds until next day # Output: exit code 0 if stdout > 0; 1 if stdout = 0; 2 if stdout < 0 # Usage: timeUntilNextDay # Usage: if ! myTTL="$(timeUntilNextDay)"; then yell "ERROR in if statement"; exit 1; fi # Depends: date 8, echo 8, yell, try - local returnState timeCurrent timeNextDay secondsUntilNextDay returnState + local returnState timeCurrent timeNextDay secondsUntilNextDay timeCurrent="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second. timeNextDay="$(date -d "$timeCurrent next day" --iso-8601=date)"; # Produce timestamp of beginning of tomorrow with resolution of 1 second. secondsUntilNextDay="$(( $(date +%s -d "$timeNextDay") - $(date +%s -d "$timeCurrent") ))" ; # Calculate seconds until closest future midnight (res. 1 second). diff --git a/unitproc/bktemp-timeUntilNextHour b/unitproc/bktemp-timeUntilNextHour index c43cd5a..6b56424 100644 --- a/unitproc/bktemp-timeUntilNextHour +++ b/unitproc/bktemp-timeUntilNextHour @@ -8,27 +8,27 @@ die() { yell "$*"; exit 111; } try() { "$@" || die "cannot $*"; } timeUntilNextHour(){ # Desc: Report seconds until next hour - # Version 1.0.0 + # Version 1.0.1 # Output: stdout: integer seconds until next hour # Output: exit code 0 if stdout > 0; 1 if stdout = 0; 2 if stdout < 0 # Usage: timeUntilNextHour # Usage: if ! myTTL="$(timeUntilNextHour)"; then yell "ERROR in if statement"; exit 1; fi - local returnState TIME_CURRENT TIME_NEXT_HOUR SECONDS_UNTIL_NEXT_HOUR - TIME_CURRENT="$(date --iso-8601=seconds)"; # Produce `date`-parsable current timestamp with resolution of 1 second. - TIME_NEXT_HOUR="$(date -d "$TIME_CURRENT next hour" --iso-8601=hours)"; # Produce `date`-parsable current time stamp with resolution of 1 second. - SECONDS_UNTIL_NEXT_HOUR="$(( $(date +%s -d "$TIME_NEXT_HOUR") - $(date +%s -d "$TIME_CURRENT") ))"; # Calculate seconds until next hour (res. 1 second). - if [[ "$SECONDS_UNTIL_NEXT_HOUR" -gt 0 ]]; then + local returnState timeCurrent timeNextHour secondsUntilNextHour + timeCurrent="$(date --iso-8601=seconds)"; # Produce `date`-parsable current timestamp with resolution of 1 second. + timeNextHour="$(date -d "$timeCurrent next hour" --iso-8601=hours)"; # Produce `date`-parsable current time stamp with resolution of 1 second. + secondsUntilNextHour="$(( $(date +%s -d "$timeNextHour") - $(date +%s -d "$timeCurrent") ))"; # Calculate seconds until next hour (res. 1 second). + if [[ "$secondsUntilNextHour" -gt 0 ]]; then returnState="true"; - elif [[ "$SECONDS_UNTIL_NEXT_HOUR" -eq 0 ]]; then + elif [[ "$secondsUntilNextHour" -eq 0 ]]; then returnState="warning_zero"; yell "WARNING:Reported time until next hour exactly zero."; - elif [[ "$SECONDS_UNTIL_NEXT_HOUR" -lt 0 ]]; then + elif [[ "$secondsUntilNextHour" -lt 0 ]]; then returnState="warning_negative"; yell "WARNING:Reported time until next hour is negative."; - fi + fi; - try echo "$SECONDS_UNTIL_NEXT_HOUR"; # Report + try echo "$secondsUntilNextHour"; # Report # Determine function return code if [[ "$returnState" = "true" ]]; then @@ -37,7 +37,7 @@ timeUntilNextHour(){ return 1; elif [[ "$returnState" = "warning_negative" ]]; then return 2; - fi + fi; } # Report seconds until next hour #===END Declare local script functions=== #==END Define script parameters==