From b03c9c0cb585665d2a6c67feabd38040cfa7069a Mon Sep 17 00:00:00 2001
From: Steven Baltakatei Sandoval <baltakatei@gmail.com>
Date: Mon, 29 Jun 2020 11:18:24 +0000
Subject: [PATCH 1/1] fix(unitproc):Fix local var decs in time-related
templates
See Declare and assign separately to avoid masking return
values. https://github.com/koalaman/shellcheck/wiki/SC2155
---
unitproc/bktemp-dateShort | 1 +
unitproc/bktemp-dateTimeShort | 1 +
unitproc/bktemp-timeUntilNextDay | 8 ++++----
unitproc/bktemp-timeUntilNextHour | 8 ++++----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/unitproc/bktemp-dateShort b/unitproc/bktemp-dateShort
index 425cf85..2608645 100644
--- a/unitproc/bktemp-dateShort
+++ b/unitproc/bktemp-dateShort
@@ -6,6 +6,7 @@ dateShort(){
# Desc: Date without separators (YYYYmmdd)
# Usage: dateShort
# Output: stdout: date (ISO-8601, no separators)
+ local TIME_CURRENT DATE_CURRENT_SHORT
TIME_CURRENT="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.
DATE_CURRENT_SHORT="$(date -d "$TIME_CURRENT" +%Y%m%d)"; # Produce separator-less current date with resolution 1 day.
echo "$DATE_CURRENT_SHORT";
diff --git a/unitproc/bktemp-dateTimeShort b/unitproc/bktemp-dateTimeShort
index dc470e0..fe30617 100644
--- a/unitproc/bktemp-dateTimeShort
+++ b/unitproc/bktemp-dateTimeShort
@@ -6,6 +6,7 @@ dateTimeShort(){
# Desc: Timestamp without separators (YYYYmmddTHHMMSS+zzzz)
# Usage: dateTimeShort
# Output: stdout: timestamp (ISO-8601, no separators)
+ local TIME_CURRENT TIME_CURRENT_SHORT
TIME_CURRENT="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.
TIME_CURRENT_SHORT="$(date -d "$TIME_CURRENT" +%Y%m%dT%H%M%S%z)"; # Produce separator-less current timestamp with resolution 1 second.
echo "$TIME_CURRENT_SHORT";
diff --git a/unitproc/bktemp-timeUntilNextDay b/unitproc/bktemp-timeUntilNextDay
index da2e0e7..762cc74 100644
--- a/unitproc/bktemp-timeUntilNextDay
+++ b/unitproc/bktemp-timeUntilNextDay
@@ -13,10 +13,10 @@ timeUntilNextDay(){
# 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
- local returnState
- local TIME_CURRENT="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.
- local TIME_NEXT_DAY="$(date -d "$TIME_CURRENT next day" --iso-8601=date)"; # Produce timestamp of beginning of tomorrow with resolution of 1 second.
- local SECONDS_UNTIL_NEXT_DAY="$(( $(date +%s -d "$TIME_NEXT_DAY") - $(date +%s -d "$TIME_CURRENT") ))" ; # Calculate seconds until closest future midnight (res. 1 second).
+ local returnState TIME_CURRENT TIME_NEXT_DAY SECONDS_UNTIL_NEXT_DAY
+ TIME_CURRENT="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.
+ TIME_NEXT_DAY="$(date -d "$TIME_CURRENT next day" --iso-8601=date)"; # Produce timestamp of beginning of tomorrow with resolution of 1 second.
+ SECONDS_UNTIL_NEXT_DAY="$(( $(date +%s -d "$TIME_NEXT_DAY") - $(date +%s -d "$TIME_CURRENT") ))" ; # Calculate seconds until closest future midnight (res. 1 second).
if [[ "$SECONDS_UNTIL_NEXT_DAY" -gt 0 ]]; then
returnState="true";
elif [[ "$SECONDS_UNTIL_NEXT_DAY" -eq 0 ]]; then
diff --git a/unitproc/bktemp-timeUntilNextHour b/unitproc/bktemp-timeUntilNextHour
index 22ac290..9cb6360 100644
--- a/unitproc/bktemp-timeUntilNextHour
+++ b/unitproc/bktemp-timeUntilNextHour
@@ -13,10 +13,10 @@ timeUntilNextHour(){
# 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
- local TIME_CURRENT="$(date --iso-8601=seconds)"; # Produce `date`-parsable current timestamp with resolution of 1 second.
- local TIME_NEXT_HOUR="$(date -d "$TIME_CURRENT next hour" --iso-8601=hours)"; # Produce `date`-parsable current time stamp with resolution of 1 second.
- local SECONDS_UNTIL_NEXT_HOUR="$(( $(date +%s -d "$TIME_NEXT_HOUR") - $(date +%s -d "$TIME_CURRENT") ))"; # Calculate seconds until closest future midnight (res. 1 second).
+ 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 closest future midnight (res. 1 second).
if [[ "$SECONDS_UNTIL_NEXT_HOUR" -gt 0 ]]; then
returnState="true";
elif [[ "$SECONDS_UNTIL_NEXT_HOUR" -eq 0 ]]; then
--
2.39.5