From ec715880e00fae2785a853270055373eab668bcc Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Tue, 4 May 2021 14:12:35 +0300
Subject: [PATCH] modified some logic

---
 bamboo-specs/src/main/resources/scripts/build.sh   |  5 +----
 .../resources/scripts/set-version.properties.sh    |  5 +++++
 .../src/main/resources/scripts/update-version.sh   | 14 --------------
 3 files changed, 6 insertions(+), 18 deletions(-)
 create mode 100755 bamboo-specs/src/main/resources/scripts/set-version.properties.sh
 delete mode 100755 bamboo-specs/src/main/resources/scripts/update-version.sh

diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh
index 30c999f8b..feb3134ce 100755
--- a/bamboo-specs/src/main/resources/scripts/build.sh
+++ b/bamboo-specs/src/main/resources/scripts/build.sh
@@ -8,8 +8,6 @@ if [[ "${BRANCH_NAME}" == "master" ]]
 then
     ./versions.sh minor
     version=$(jq -r '.version' < package.json)
-    echo "Preparing release properties"
-    echo "APP_VERSION=${version}" > version.properties
 fi
 
 
@@ -19,7 +17,6 @@ then
     version=$(jq -r '.version' < package.json)
 fi
 
-
 echo "Building version ${version}"
 docker build -t "${imageName}":latest -f "${dockerfileLocation}" .
 
@@ -29,10 +26,10 @@ then
     echo "Publishing Images with version ${version}"
     echo "${BAMBOO_DOWNLOAD_PASS} | docker login -u ${BAMBOO_DOWNLOAD_USER} --password-stdin nexus.iqser.com:5001"
 
-
     docker push "${imageName}":latest
     docker tag "${imageName}":latest "${imageName}":"${version}"
     docker push "${imageName}":"${version}"
+
 else
     echo "Not on a relevant branch ${BRANCH_NAME} ... skipping."
 fi
diff --git a/bamboo-specs/src/main/resources/scripts/set-version.properties.sh b/bamboo-specs/src/main/resources/scripts/set-version.properties.sh
new file mode 100755
index 000000000..632798290
--- /dev/null
+++ b/bamboo-specs/src/main/resources/scripts/set-version.properties.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+version=$(jq -r '.version' < package.json)
+echo "Preparing release properties for version ${version}"
+echo "APP_VERSION=${version}" > version.properties
diff --git a/bamboo-specs/src/main/resources/scripts/update-version.sh b/bamboo-specs/src/main/resources/scripts/update-version.sh
deleted file mode 100755
index a8e3d42ef..000000000
--- a/bamboo-specs/src/main/resources/scripts/update-version.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [[ "${BRANCH_NAME}" == "master" ]]
-then
-    ./versions.sh minor
-    echo "Updating minor version ... "
-fi
-
-
-if [[ "${BRANCH_NAME}" == release* ]]
-then
-    ./versions.sh patch
-    echo "Updating patch version ... "
-fi