From df543a3e92f8f4395e09cfc4298a1b1fa9d3f5ff Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 12 Apr 2021 00:42:48 +0200
Subject: [PATCH] Make detecting version more reliable

The docker bash scripts try to get the version from sbt, without
calling sbt but reading the files. This was relying on a specific
position. It is now a bit more robust.
---
 docker/dev-build-images.sh | 8 ++------
 docker/dev-push-images.sh  | 4 +---
 docker/hooks/build         | 4 +---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docker/dev-build-images.sh b/docker/dev-build-images.sh
index e3c09f43..c33103df 100755
--- a/docker/dev-build-images.sh
+++ b/docker/dev-build-images.sh
@@ -5,12 +5,8 @@ if [ $# -eq 1 ]; then
   REPO=$1
 fi
 
-SBT_VERSION=$(grep sbt.version ../project/build.properties)
-SBT_VERSION=${SBT_VERSION:12:99}
-
-TMP_VERSION=$(cat ../version.sbt)
-TMP_VERSION=${TMP_VERSION:25:99}
-VERSION=${TMP_VERSION%\"}
+SBT_VERSION=$(grep sbt.version ../project/build.properties|cut -d'=' -f2|xargs)
+VERSION=$(cat ../version.sbt | cut -d'=' -f2 | tr -d '"'|xargs)
 
 if [[ $VERSION == *"SNAPSHOT" ]]; then
   VERSION=SNAPSHOT
diff --git a/docker/dev-push-images.sh b/docker/dev-push-images.sh
index 60c6aaa0..d922ecfb 100755
--- a/docker/dev-push-images.sh
+++ b/docker/dev-push-images.sh
@@ -5,9 +5,7 @@ if [ $# -eq 1 ]; then
   REPO=$1
 fi
 
-TMP_VERSION=$(cat ../version.sbt)
-TMP_VERSION=${TMP_VERSION:25:99}
-VERSION=${TMP_VERSION%\"}
+VERSION=$(cat ../version.sbt | cut -d'=' -f2 | tr -d '"'|xargs)
 
 if [[ $VERSION == *"SNAPSHOT" ]]; then
   VERSION=SNAPSHOT
diff --git a/docker/hooks/build b/docker/hooks/build
index e0a249cf..6282ce0e 100644
--- a/docker/hooks/build
+++ b/docker/hooks/build
@@ -15,9 +15,7 @@ echo "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 # verify that version.sbt and tag match for non-snapshot (ENV variable DOCKER_VERIFY_TAG must be set to 1)
 if [ $DOCKER_VERIFY_TAG -eq 1 ] && [[ "$DOCKER_TAG" != *"-SNAPSHOT" ]]; then
   echo validating version number...
-  TMP_VERSION=$(cat ../version.sbt)
-  TMP_VERSION=${TMP_VERSION:25:99}
-  VERSION=${TMP_VERSION%\"}
+  VERSION=$(cat ../version.sbt | cut -d'=' -f2 | tr -d '"'|xargs)
   if [ "$DOCKER_TAG" != "base-v$VERSION" ]; then
     echo "version number mismatch (Docker/Tag: $DOCKER_TAG, Project: $VERSION), aborting!"
     exit 1