From f049d6621951abca67016fbde348e3f621618255 Mon Sep 17 00:00:00 2001
From: Linus Probert <linus.probert@verisure.com>
Date: Thu, 17 May 2018 10:06:58 +0200
Subject: [PATCH] Fixed releasenotes and script again

---
 build/releasenotes/early-access-v5     |  0
 build/releasenotes/early-access-v5.txt |  8 ++++++++
 build/scripts/release_patch_version.sh | 15 +++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 build/releasenotes/early-access-v5
 create mode 100644 build/releasenotes/early-access-v5.txt

diff --git a/build/releasenotes/early-access-v5 b/build/releasenotes/early-access-v5
deleted file mode 100644
index e69de29..0000000
diff --git a/build/releasenotes/early-access-v5.txt b/build/releasenotes/early-access-v5.txt
new file mode 100644
index 0000000..5cdfda4
--- /dev/null
+++ b/build/releasenotes/early-access-v5.txt
@@ -0,0 +1,8 @@
+769a659 Patch version raised to 5
+0fcc1d2 Last time now
+60750d7 Patch version raised to 5
+a551c52 More trickery
+fa0dbe2 Fixes miss in release script
+beb2e79 Patch version raised to 5
+7f09fbd Fiddled some more with release script
+d4f2514 Patch version raised to 5
diff --git a/build/scripts/release_patch_version.sh b/build/scripts/release_patch_version.sh
index 8d9c17a..c6c0f55 100644
--- a/build/scripts/release_patch_version.sh
+++ b/build/scripts/release_patch_version.sh
@@ -4,16 +4,19 @@
 LAST_VERSION=$(egrep -o 'breakhack_PATCH_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}')
 NEXT_VERSION=$((LAST_VERSION + 1))
 
+LAST_TAG=early-access-v$LAST_VERSION
+NEXT_TAG=early-access-v$NEXT_VERSION
+
 # Update the version and create release notes
 sed -i -e "s/breakhack_PATCH_VERSION [0-9]\+/breakhack_PATCH_VERSION $NEXT_VERSION/" CMakeLists.txt
-git log --oneline early-access-v$LAST_VERSION..early-access-v$NEXT_VERSION > build/releasenotes/early-access-v$NEXT_VERSION
-git add build/releasenotes/early-access-v$NEXT_VERSION
+git log --oneline $LAST_TAG..$NEXT_TAG > build/releasenotes/$NEXT_TAG.txt
+git add build/releasenotes/$NEXT_TAG.txt
 git commit -a -m"Patch version raised to $NEXT_VERSION"
 
+# Create the tag
+git tag $NEXT_TAG
+
 # Push to repo
 git push
-
-# Create the tag
-git tag early-access-v$NEXT_VERSION
-git push origin early-access-v$NEXT_VERSION
+git push origin $NEXT_TAG