From 2d2e72c86ecfe5a489be107f7fdd94b2d128dc30 Mon Sep 17 00:00:00 2001
From: Francisco Schulz <Francisco.Schulz@iqser.com>
Date: Mon, 14 Nov 2022 10:39:30 +0100
Subject: [PATCH] remove redundancies

---
 bamboo-specs/scripts/git-tag.sh | 37 +++++++++++++--------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/bamboo-specs/scripts/git-tag.sh b/bamboo-specs/scripts/git-tag.sh
index b9c2dbf..84e32da 100755
--- a/bamboo-specs/scripts/git-tag.sh
+++ b/bamboo-specs/scripts/git-tag.sh
@@ -7,9 +7,9 @@ python3 -m pip install --upgrade pip
 pip install poetry
 
 echo "bamboo plan repo branch name: $bamboo_planRepository_branchName"
-echo "bamboo version tag:   $bamboo_version_tag"
+echo "bamboo version tag:           $bamboo_version_tag"
 echo "bamboo plan repo 1 branch:    $bamboo_planRepository_1_branch"
-echo "bamboo build number:  $bamboo_buildNumber"
+echo "bamboo build number:          $bamboo_buildNumber"
 
 # update version in poetry to latest version in git if it is lower
 check_poetry_version () {
@@ -22,20 +22,20 @@ check_poetry_version () {
         echo "latest version tag in git:    ${gitVersion}"
         echo "current version in project:   ${projectVersion}"
 
-        if [[ "$projectVersion" < "$gitVersion" ]]
+        if [[ $projectVersion < $gitVersion ]]
         then
             echo "project version is behind"
             echo "setting latest git tag as current version"
             poetry version "$gitVersion"
             updateVersion=0  # 0 means all is good means true, yes it's weird
-        elif [[ "$projectVersion" == "$gitVersion" ]]
+        elif [[ $projectVersion == $gitVersion ]]
         then
             echo "project version matches"
             echo "keeping the project version"
             updateVersion=0
         else
-            echo "project version is higher"
-            echo "keeping the project version, be aware that a version might have been skipped"
+            echo "project version is higher (aka. has been manually set in pyproject.toml)"
+            echo "keeping the project version"
             updateVersion=1
         fi
     else
@@ -46,42 +46,33 @@ check_poetry_version () {
 }
 
 
-if [[ "$bamboo_planRepository_branchName" == "master" ]]
+if [[ $bamboo_planRepository_branchName == "master" ]]
 then
     if check_poetry_version
     then
         echo "updating version number by one minor increment"
         poetry version minor
     fi
-    newVersion="$(poetry version -s)"
-    echo "new release on master with version:   $newVersion"
-elif [[ "$bamboo_planRepository_branchName" =~ ^(release/) ]]
+elif [[ $bamboo_planRepository_branchName =~ ^(release/) ]]
 then
     if check_poetry_version
     then
         echo "updating version number by one patch increment"
         poetry version patch
     fi
-    newVersion="$(poetry version -s)"
-    echo "new release on $bamboo_planRepository_branchName with version:    $newVersion"
-elif [[ "$bamboo_planRepository_branchName" =~ ^(hotfix/|bugfix/|feature/) ]]
+elif [[ $bamboo_planRepository_branchName =~ ^(hotfix/|bugfix/|feature/) ]]
 then
     if check_poetry_version
     then
         echo "updating version number by one prerelease increment"
         poetry version prerelease
     fi
-    newVersion="$(poetry version -s)"
-    echo "new release on $bamboo_planRepository_branchName with version:    $newVersion"
-# elif [[ "$bamboo_version_tag" != "dev" ]]
-# then
-#     newVersion="$(poetry version -s)-${bamboo_version_tag}"
-#     echo "new special version build with:   $newVersion"
 else
-    poetry version prepatch
-    newVersion="$(poetry version -s)"
-    echo "dev build with tag:   ${newVersion}"
-
+    poetry version prerelease
+    newVersion="$(poetry version -s)-dev"
 fi
 
+newVersion="$(poetry version -s)"
+"new build on $bamboo_planRepository_branchName with version:   ${newVersion}"
+
 echo "gitTag=${newVersion}" > git.tag