Merge tag '0.4.7'

[BK-2020-03.git] / unitproc / bktemp-dateTimeShort

diff --git a/unitproc/bktemp-dateTimeShort b/unitproc/bktemp-dateTimeShort
index 6606d775ad6c225f281e648a473d4b245ea99395..2a31d1f71bec27cc301fd3f056a99ae3002a5869 100644 (file)
--- a/unitproc/bktemp-dateTimeShort
+++ b/unitproc/bktemp-dateTimeShort
@@ -8,40 +8,42 @@ try() { "$@" || die "cannot $*"; } #o
 dateTimeShort(){
     # Desc: Timestamp without separators (YYYYmmddTHHMMSS+zzzz)
     # Usage: dateTimeShort ([str date])
 dateTimeShort(){
     # Desc: Timestamp without separators (YYYYmmddTHHMMSS+zzzz)
     # Usage: dateTimeShort ([str date])

-    # Version 1.1.0
+    # Version 1.1.1

     # Input: arg1: 'date'-parsable timestamp string (optional)
     # Output: stdout: timestamp (ISO-8601, no separators)
     # Depends: yell
     # Input: arg1: 'date'-parsable timestamp string (optional)
     # Output: stdout: timestamp (ISO-8601, no separators)
     # Depends: yell

-    local TIME_CURRENT TIME_CURRENT_SHORT
+    local argTime timeCurrent timeInput timeCurrentShort

 
     argTime="$1";
     # Get Current Time
 
     argTime="$1";
     # Get Current Time

-    TIME_CURRENT="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.
+    timeCurrent="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.

     # Decide to parse current or supplied date
     ## Check if time argument empty
     if [[ -z "$argTime" ]]; then
        ## T: Time argument empty, use current time
     # Decide to parse current or supplied date
     ## Check if time argument empty
     if [[ -z "$argTime" ]]; then
        ## T: Time argument empty, use current time

-       TIME_INPUT="$TIME_CURRENT";
+       timeInput="$timeCurrent";

     else
        ## F: Time argument exists, validate time
        if date --date="$argTime" 1>/dev/null 2>&1; then
            ### T: Time argument is valid; use it
     else
        ## F: Time argument exists, validate time
        if date --date="$argTime" 1>/dev/null 2>&1; then
            ### T: Time argument is valid; use it

-           TIME_INPUT="$argTime";
+           timeInput="$argTime";

        else
            ### F: Time argument not valid; exit
            yell "ERROR:Invalid time argument supplied. Exiting."; exit 1;
        fi
     fi
     # Construct and deliver separator-les date string
        else
            ### F: Time argument not valid; exit
            yell "ERROR:Invalid time argument supplied. Exiting."; exit 1;
        fi
     fi
     # Construct and deliver separator-les date string

-    TIME_CURRENT_SHORT="$(date -d "$TIME_INPUT" +%Y%m%dT%H%M%S%z)";
-    echo "$TIME_CURRENT_SHORT";
+    timeCurrentShort="$(date -d "$timeInput" +%Y%m%dT%H%M%S%z)";
+    echo "$timeCurrentShort";

 } # Get YYYYmmddTHHMMSS±zzzz
 
 #==BEGIN sample code==
 echo "The current day and time is :$(dateTimeShort)";
 echo "Contact lost with STS-107 on:$(dateTimeShort "2003-02-01T08:59:15-05:00")";
 echo "Bitcoin started on          :$(dateTimeShort "@1231006505")";
 } # Get YYYYmmddTHHMMSS±zzzz
 
 #==BEGIN sample code==
 echo "The current day and time is :$(dateTimeShort)";
 echo "Contact lost with STS-107 on:$(dateTimeShort "2003-02-01T08:59:15-05:00")";
 echo "Bitcoin started on          :$(dateTimeShort "@1231006505")";

-
+testDate="2020-07-07T02:30:11,690097074+00:00";
+echo "This string was generated using 'date --iso-8601=ns':$testDate";
+echo "Using dateTimeShort, it appears as:$(dateTimeShort "$testDate")";

 #==END sample code==
 
 # Author: Steven Baltakatei Sandoval
 #==END sample code==
 
 # Author: Steven Baltakatei Sandoval