From dede70b9d4f608fbbbf6f7ef6b53a7bad00f94ea Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 19 Oct 2016 12:16:09 +0200
Subject: [PATCH] [Project] inline version.sh into hotfix.sh and release.sh

---
 hotfix.sh  | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 release.sh |  26 ++++++++++-
 2 files changed, 153 insertions(+), 2 deletions(-)
 create mode 100644 hotfix.sh

diff --git a/hotfix.sh b/hotfix.sh
new file mode 100644
index 000000000..b053073cc
--- /dev/null
+++ b/hotfix.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+
+# usage
+if [ $# != 2 ] ; then
+  echo -e "Usage: ${0} <release_version> <hotfix_version>"
+  exit 1
+fi
+
+
+# Confirm
+releaseVersion="${1}"
+releaseBranch="release/${1}"
+hotfixVersion="${2}"
+echo -e "INFO: Do you want to make hotfix version ${hotfixVersion} from release branch ${releaseBranch}? y/n"
+read a
+if [[ "${a}" != "y" && "${a}" != "Y" ]] ; then
+  exit 0;
+fi
+
+
+# validate tag does not exist
+echo -e "INFO: Fetching tags and branches and validating they do not exist..."
+if ! git fetch --all --tags > /dev/null ; then
+  echo -e "ERROR: Tags and branches could not be fetched!"
+  exit 1
+fi
+if git tag | grep ${hotfixVersion} > /dev/null ; then
+  echo -e "ERROR: Tag already exists!"
+  exit 1
+fi
+
+
+# make sure gpg-agent is available and loaded
+echo -e "\nINFO: Searching for gpg-agent..."
+if ! which gpg-agent ; then
+  echo -e "ERROR: gpg-agent missing!"
+fi
+if ! gpg-agent 2>&1 | grep "running and available" ; then
+  echo -e "WARN: gpg-agent not running, trying to start..."
+  if ! gpg-agent --daemon ; then
+    echo -e "ERROR: Failed to initialize gpg-agent, please make sure it is up and running before continuing!"
+    exit 1
+  fi
+  if ! gpg-agent 2>&1 | grep "running and available" ; then
+    echo -e "ERROR: Failed to initialize gpg-agent, please make sure it is up and running before continuing!"
+    exit 1
+  fi
+fi
+
+
+# Checkout release branch
+echo -e "\nINFO: Checking out release branch ${releaseBranch}"
+if ! git checkout ${releaseBranch} ; then
+  echo -e "ERROR: Failed to checkout branch ${releaseBranch}"
+  exit 1
+fi
+
+
+# create temp branch
+echo -e "\nINFO: Creating temp branch..."
+if ! git checkout -b temp ; then
+  echo -e "ERROR: Failed to create temp branch!"
+  exit 1
+fi
+
+
+# set hotfix version
+echo -e "\nINFO: Setting version..."
+if ! mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${hotfixVersion} > /dev/null ; then
+  echo -e "ERROR: Failed to set new version!"
+  exit 1
+fi
+
+
+# build
+echo -e "\nINFO: Doing a build with new version..."
+if ! mvn clean package -DskipTests > /dev/null ; then
+  echo -e "ERROR: Failed to build with new version!"
+  exit 1
+fi
+
+
+# commit to tag
+echo -e "\nINFO: Creating tag..."
+if ! git add . ; then
+  echo -e "ERROR: Failed to git add"
+  exit 1
+fi
+if ! git commit -m "[Project] Set new version ${hotfixVersion}" ; then
+  echo -e "ERROR: Failed to git commit"
+  exit 1
+fi
+if ! git tag --sign --message "[Project] New Version ${hotfixVersion}" ${hotfixVersion} ; then
+  echo -e "ERROR: Failed to git tag"
+  exit 1
+fi
+
+
+# cleanup
+echo -e "\nINFO: Cleaning up..."
+if ! git checkout ${releaseBranch} ; then
+  echo -e "ERROR: Failed to checkout release branch"
+  exit 1
+fi
+if ! git branch -D temp ; then
+  echo -e "ERROR: Failed to delete temp branch"
+  exit 1
+fi
+
+
+# git push
+echo -e "\nINFO: Hotfix ${hotfixVersion} created. Do you want to push to origin? y/n"
+read a
+if [[ "${a}" == "y" || "${a}" == "Y" ]] ; then
+  echo -e "INFO: Pushing to origin..."
+  if ! git push origin ${hotfixVersion} ; then
+    echo -e "ERROR: Failed to push tag"
+    exit 1
+  fi
+  echo -e "\nINFO: Pushed hotfix tag ${hotfixVersion}"
+else
+  echo -e "WARN: Release not pushed!"
+fi
+
+
+echo -e "\nINFO: Hotfix ${hotfixVersion} created."
+
+
+exit 0
diff --git a/release.sh b/release.sh
index 93bde5853..0a98d0cd9 100644
--- a/release.sh
+++ b/release.sh
@@ -17,6 +17,28 @@ if [[ "${a}" != "y" && "${a}" != "Y" ]] ; then
 fi
 
 
+# validate tag and release branch do not exist
+echo -e "INFO: Fetching tags and branches and validating they do not exist..."
+if ! git fetch --all --tags > /dev/null ; then
+  echo -e "ERROR: Tags and branches could not be fetched!"
+  exit 1
+fi
+if git tag | grep "${releaseVersion}" > /dev/null ; then
+  echo -e "ERROR: Tag already exists!"
+  exit 1
+fi
+if git branch --all | grep "release/${releaseVersion}" > /dev/null ; then
+  echo -e "ERROR: Tag already exists!"
+  exit 1
+fi
+
+# validate tag does not exist
+if git tag | grep "${releaseVersion}" > /dev/null ; then
+  echo -e "ERROR: Tag already exists!"
+  exit 1
+fi
+
+
 # make sure gpg-agent is available and loaded
 echo -e "\nINFO: Searching for gpg-agent..."
 if ! which gpg-agent ; then
@@ -57,7 +79,7 @@ fi
 
 # set release version
 echo -e "\nINFO: Setting version..."
-if ! ./setVersion.sh ${releaseVersion} > /dev/null ; then
+if ! mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${releaseVersion} > /dev/null ; then
   echo -e "ERROR: Failed to set new version!"
   exit 1
 fi
@@ -118,7 +140,7 @@ else
 fi
 
 
-echo -e "\nINFO: Strolch release ${releaseVersion} created."
+echo -e "\nINFO: Release ${releaseVersion} created."
 echo -e "INFO: Don't forget to update snapshot version!"