From c2af81ced0db5d9d7f4f67c01e804a1117081deb Mon Sep 17 00:00:00 2001
From: slycordinator <68940237+slycordinator@users.noreply.github.com>
Date: Sun, 11 Oct 2020 21:22:43 +0900
Subject: [PATCH] Changes from shellcheck output and removed bc dep

Modified to quote variables more consistently from shellcheck recommendations

Modified to not need/use bc, since all unix/posix shells can do integer division directly
---
 clockout.bash | 82 ++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/clockout.bash b/clockout.bash
index 5e7ce84..f8ed75c 100755
--- a/clockout.bash
+++ b/clockout.bash
@@ -1,60 +1,56 @@
 #!/bin/bash
 
 test_dependency () {
-    if ! [ -x "$(command -v $1)" ]; then
-        echo "Error: $1 is not installed." >&2
-        exit 1
-    fi
+	if ! command -v "$1" >/dev/null 2>&1; then
+		echo "Error: $1 is not installed." >&2
+		exit 1
+	fi
 }
-test_dependency "bc"
 test_dependency "units"
 
 # Test input file
-if [ "$1" = "" ]; then
-    echo "Error: no input file provided" >&2
-    exit 1
+if [ "$1" = '' ]; then
+	echo 'Error: no input file provided' >&2
+	exit 1
 fi
-while read -r line
-do
-    if ! echo "$line" | egrep -q '^\S+\s+(2[0-3]|[0-1][0-9]):[0-5][0-9]\s+(2[0-3]|[0-1][0-9]):[0-5][0-9](\s.*)?$'; then
-        echo -e "Error: input file has incorrect format on line:\n$line" >&2
-        exit 1
-    fi
+while read -r line ; do
+	if ! echo "$line" | grep -E -q '^\S+\s+(2[0-3]|[0-1][0-9]):[0-5][0-9]\s+(2[0-3]|[0-1][0-9]):[0-5][0-9](\s.*)?$'; then
+		echo -e "Error: input file has incorrect format on line:\n$line" >&2
+		exit 1
+	fi
 done < "$1"
 
 # Clockout
 TOTAL=0
-PREVIOUS_STORY=""
+PREVIOUS_STORY=''
 PREVIOUS_DURATION=0
 SUBTOTAL=0
-DATA=$(sort "$1")
-DATA+="\n"
-echo -e "$DATA" | { while read line
-do
-    STORY=$(echo $line | awk '{print $1}')
-    FROM=$(echo $line | awk '{print $2}')
-    TO=$(echo $line | awk '{print $3}')
-    COMMENT=$(echo -e $line | sed -E 's/\s+/ /g' | cut --delimiter=' ' --fields=1,2,3 --complement)
-    FROM_EPOCH=$(date +%s --date=$FROM)
-    TO_EPOCH=$(date +%s --date=$TO)
-    DURATION=$(echo "($TO_EPOCH - $FROM_EPOCH) / 60.0" | bc)
-    TOTAL=$(echo "$TOTAL + $DURATION" | bc)
-    if [ "$STORY" = "$PREVIOUS_STORY" ]; then
-        SUBTOTAL=$(echo "$SUBTOTAL + $DURATION" | bc)
-    else
-        if [ $SUBTOTAL -gt $PREVIOUS_DURATION ]; then
-            echo -e "└ Subtotal: $SUBTOTAL"
-        fi
-        if [ "$PREVIOUS_STORY" != "" ]; then
-            echo
-        fi
-        SUBTOTAL=$DURATION
-    fi
-    if [ "$line" != "" ]; then
-        echo -e "$STORY\t\t\t\t$FROM\t$TO\t$DURATION\t$COMMENT"
-    fi
-    PREVIOUS_STORY=$STORY
-    PREVIOUS_DURATION=$DURATION
+DATA="$(sort "$1")\n"
+echo -e "$DATA" | { while read -r line ; do
+	STORY="$(echo "$line" | awk '{print $1}')"
+	FROM="$(echo "$line" | awk '{print $2}')"
+	TO="$(echo "$line" | awk '{print $3}')"
+	COMMENT="$(echo -e "$line" | sed -E 's/\s+/ /g' | cut --delimiter=' ' --fields=1,2,3 --complement)"
+	FROM_EPOCH="$(date +%s --date="$FROM")"
+	TO_EPOCH="$(date +%s --date="$TO")"
+	DURATION="$(((TO_EPOCH - FROM_EPOCH)/60))"
+	TOTAL="$((TOTAL + DURATION))"
+	if [ "$STORY" = "$PREVIOUS_STORY" ]; then
+		SUBTOTAL="$((SUBTOTAL + DURATION))"
+	else
+		if [ "$SUBTOTAL" -gt "$PREVIOUS_DURATION" ]; then
+			echo -e "└ Subtotal: $SUBTOTAL"
+		fi
+		if [ "$PREVIOUS_STORY" != '' ]; then
+			echo
+		fi
+		SUBTOTAL="$DURATION"
+	fi
+	if [ "$line" != '' ]; then
+		echo -e "$STORY\t\t\t\t$FROM\t$TO\t$DURATION\t$COMMENT"
+	fi
+	PREVIOUS_STORY="$STORY"
+	PREVIOUS_DURATION="$DURATION"
 done
 echo -e "Total: $(units "$TOTAL minutes" time)"
 }