Merge branch 'master' of https://zdv2.bktei.com/gitweb/baltakatei-exdev

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

diff --git a/unitproc/bktemp-timeDuration b/unitproc/bktemp-timeDuration
index 21c9d6979e0dde686ac2a752e08dcb51626219a6..1db408b8c101a203a026a03ab16486b2544a23f8 100644 (file)
--- a/unitproc/bktemp-timeDuration
+++ b/unitproc/bktemp-timeDuration
@@ -10,7 +10,7 @@ timeDuration(){
     # Ref/Attrib: ISO-8601:2004(E), §4.4.4.2 Representations of time intervals by duration and context information
     # Note: "1 month" ("P1M") is assumed to be "30 days" (see ISO-8601:2004(E), §2.2.1.2)
     # Usage: timeDuration [1:seconds] ([2:precision])
-    # Version: 1.0.3
+    # Version: 1.0.5
     # Input: arg1: seconds as base 10 integer >= 0  (ex: 3601)
     #        arg2: precision level (optional; default=2)
     # Output: stdout: ISO-8601 duration string (ex: "P1H1S", "P2Y10M15DT10H30M20S")
@@ -18,11 +18,12 @@ timeDuration(){
     #         exit code 1: error_input
     #         exit code 2: error_unknown
     # Example: 'timeDuration 111111 3' yields 'P1DT6H51M'
-    # Depends: date 8 (gnucoreutils), yell, 
-    local returnState argSeconds argPrecision remainder precision witherPrecision
+    # Depends: date 8, bash 5, yell,
+    local argSeconds argPrecision precision returnState remainder
     local fullYears fullMonths fullDays fullHours fullMinutes fullSeconds
-    local displayYears displayMonths displayDays displayHours displayMinutes displaySeconds
     local hasYears hasMonths hasDays hasHours hasMinutes hasSeconds
+    local witherPrecision output
+    local displayYears displayMonths displayDays displayHours displayMinutes displaySeconds
     
     argSeconds="$1"; # read arg1 (seconds)
     argPrecision="$2"; # read arg2 (precision)
@@ -85,7 +86,7 @@ timeDuration(){
     if [[ $fullDays -gt 0 ]]; then hasDays="true"; else hasDays="false"; fi
     if [[ $fullHours -gt 0 ]]; then hasHours="true"; else hasHours="false"; fi
     if [[ $fullMinutes -gt 0 ]]; then hasMinutes="true"; else hasMinutes="false"; fi
-    if [[ $fullSeconds -gt 0 ]]; then hasSeconds="true"; else hasSeconds="false"; fi
+    if [[ $fullSeconds -ge 0 ]]; then hasSeconds="true"; else hasSeconds="false"; fi
     
     ## Determine which fields to display (see ISO-8601:2004 §4.4.3.2)
     witherPrecision="false"
@@ -165,24 +166,24 @@ timeDuration(){
        displayDateTime="true"; else displayDateTime="false"; fi
     
     ## Construct duration output string
-    OUTPUT="P"
+    output="P"
     if $displayYears; then
-       OUTPUT=$OUTPUT$fullYears"Y"; fi
+       output=$output$fullYears"Y"; fi
     if $displayMonths; then
-       OUTPUT=$OUTPUT$fullMonths"M"; fi
+       output=$output$fullMonths"M"; fi
     if $displayDays; then
-       OUTPUT=$OUTPUT$fullDays"D"; fi
+       output=$output$fullDays"D"; fi
     if $displayDateTime; then
-       OUTPUT=$OUTPUT"T"; fi
+       output=$output"T"; fi
     if $displayHours; then
-       OUTPUT=$OUTPUT$fullHours"H"; fi
+       output=$output$fullHours"H"; fi
     if $displayMinutes; then
-       OUTPUT=$OUTPUT$fullMinutes"M"; fi
+       output=$output$fullMinutes"M"; fi
     if $displaySeconds; then
-       OUTPUT=$OUTPUT$fullSeconds"S"; fi
+       output=$output$fullSeconds"S"; fi
 
     ## Output duration string to stdout
-    echo "$OUTPUT" && returnState="true";
+    echo "$output" && returnState="true";
 
     #===Determine function return code===
     if [ "$returnState" = "true" ]; then
@@ -205,7 +206,8 @@ echo "Precision 3 duration:$(timeDuration "$(date +%s)" 3)"
 echo "Precision 2 duration:$(timeDuration "$(date +%s)" 2)"
 echo "Precision 1 duration:$(timeDuration "$(date +%s)" 1)"
 echo "Precision 6 duration:$(timeDuration $((60+60*60+60*60*24+60*60*24*30+60*60*24*365 - (60+60*60+60*60*24+60*60*24*30) )) 6)"
-timeDuration "$@"
+echo "Zero seconds:$(timeDuration "0")";
+echo "Parsing argument provided to script:\"$*\""; timeDuration "$@"
 #==END sample code==
 
 # Author: Steven Baltakatei Sandoval