From 5ef23bb5af757f84c89ba329ebe5e4fe502205a7 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Fri, 29 Apr 2016 01:13:52 -0400 Subject: remove required gdate dependency --- cbt | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'cbt') diff --git a/cbt b/cbt index 5d02917..0c5eaca 100755 --- a/cbt +++ b/cbt @@ -8,12 +8,27 @@ # - reduction of dependencies # - performance improvements -start_seconds=$(gdate +"%s") -start_nanos=1$(gdate +"%N") +seconds() { + date +"%s" +} + +nanos() { + n=$(date +"%N") + if [ "$n" = "N" ]; then + n=$(gdate +"%N" 2>/dev/null) + fi + if [ "$n" = "" ]; then + n="0" + fi + echo $n +} + +start_seconds=$(seconds) +start_nanos=1$(nanos) time_taken() { - i=$(( $(gdate +"%s") - start_seconds )) - n=$(( $(( 1$(gdate +"%N") - start_nanos )) / 1000000 )) + i=$(( $(seconds) - start_seconds )) + n=$(( $(( 1$(nanos) - start_nanos )) / 1000000 )) if [[ ( "$n" < 0 ) ]]; then i=$(( i-1 )) n=$(( n+1000 )) @@ -33,12 +48,8 @@ log () { shift done if [ $enabled -eq 0 ]; then - which gdate 2>&1 > /dev/null - gdate_installed=$? - if [ $gdate_installed -eq 0 ]; then - delta=$(time_taken) - echo "[$delta] $msg" 1>&2 - fi + delta=$(time_taken) + echo "[$delta] $msg" 1>&2 fi } -- cgit v1.2.3