From c9fb2c0922060de8ea01a6cf589dd54fb88cf4d8 Mon Sep 17 00:00:00 2001
From: "Antonino Sabetta (i064196)" <antonino.sabetta@sap.com>
Date: Wed, 23 Sep 2020 10:49:27 +0200
Subject: [PATCH] chore: updated changelog generation

---
 scripts/changelog-gen.py |  3 ++-
 scripts/release.sh       | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/changelog-gen.py b/scripts/changelog-gen.py
index 8ec989f2..f89086ea 100755
--- a/scripts/changelog-gen.py
+++ b/scripts/changelog-gen.py
@@ -14,7 +14,8 @@
     'change': "Changes",
     'refactor': "Changes",
     'refactoring': "Changes",
-    'chore': "Chores",
+    'chore': "Misc",
+    'misc': "Misc",
     'docs': "Docs"}
 
 
diff --git a/scripts/release.sh b/scripts/release.sh
index 70aef60d..b116b865 100644
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -19,7 +19,8 @@ echo "Creating changelog..."
 > NEW-CHANGELOG.md
 head -n1 CHANGELOG.md >> NEW-CHANGELOG.md
 echo >> NEW-CHANGELOG.md
-$PROJECT_ROOT/scripts/changelog-gen.py >> NEW-CHANGELOG.md
+$PROJECT_ROOT/scripts/changelog-gen.py >> CHANGELOG-${RELEASE}.md
+cat CHANGELOG-${RELEASE}.md >> NEW-CHANGELOG.md
 tail -n +2 CHANGELOG.md >> NEW-CHANGELOG.md
 mv NEW-CHANGELOG.md CHANGELOG.md
 
@@ -34,6 +35,9 @@ echo "Pushing..."
 git push
 git push --tags
 
-echo "Do not forget to update $PROJECT_ROOT/kaybee/VERSION"
-echo "and to create a release on GitHub"
+echo "Update the version for the next relase cycle (Enter to proceed)"
+read
+nano $PROJECT_ROOT/kaybee/VERSION
+
+echo "Do not forget to create a release on GitHub"
 echo "Done"