From ac913d370236a3375b3fbfe0a54ffb9cc60b7d36 Mon Sep 17 00:00:00 2001
From: jomu <joern@muehlencord.de>
Date: Thu, 17 Aug 2017 10:38:51 +0200
Subject: [PATCH] improved calculation

---
 scripts/calculateProgress.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/calculateProgress.sh b/scripts/calculateProgress.sh
index f23de60..003efa1 100755
--- a/scripts/calculateProgress.sh
+++ b/scripts/calculateProgress.sh
@@ -6,6 +6,10 @@ function printUsage() {
 	exit 1
 }
 
+min_number() {
+	    printf "%s\n" "$@" | sort -g | head -n1
+}
+
 level=$1
 
 if [ -z "$1" ]; then 
@@ -39,12 +43,14 @@ read levelTiles fileName <<< $(wc -l /tmp/files.txt)
 #echo levelTiles=$levelTiles
 
 # calculate progress
-percentageRequired=$(echo "scale=8;$previousLevelTiles / $previousLevel100" | bc)
+percentageRequired=$(echo "scale=5;$previousLevelTiles / $previousLevel100" | bc)
+#echo percentageRequired=$percentageRequired
+percentageRequired="$(min_number $percentageRequired 1)"
 #echo percentageRequired=$percentageRequired
 levelTarget=$(echo "$level100 * $percentageRequired" | bc)
 #echo levelTarget=$levelTarget
 levelCalculated=$(echo "scale=4;($levelTiles / $levelTarget)" | bc)
 #echo levelCalculated=$levelCalculated
 progress=$(echo "scale=2;($levelCalculated*100)/1" | bc)
+progress="$(min_number $progress 100)"
 echo progress=$progress%
-