From a38d55c878b5366749b0ee21adffa47afc9c4271 Mon Sep 17 00:00:00 2001 From: Steven Baltakatei Sandoval Date: Tue, 14 Jul 2020 03:21:49 +0000 Subject: [PATCH] fix(unitproc):timeDuration():Fix edge case of 0 second duration Script would output "P" instead of "PT0S" if "0" were provided as a duration argument. --- unitproc/bktemp-timeDuration | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/unitproc/bktemp-timeDuration b/unitproc/bktemp-timeDuration index 57ea1f5..1db408b 100644 --- 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.4 + # 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") @@ -86,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" @@ -206,6 +206,7 @@ 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)" +echo "Zero seconds:$(timeDuration "0")"; echo "Parsing argument provided to script:\"$*\""; timeDuration "$@" #==END sample code== -- 2.30.2