From 1f9ab7ca5d5c04db24e9eb50d375178b0de8d568 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Sun, 22 Jan 2017 20:02:27 +0100
Subject: [PATCH] Fix path to CHANGELOG

---
 make_release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make_release.sh b/make_release.sh
index 9472afeb6..19c661b38 100755
--- a/make_release.sh
+++ b/make_release.sh
@@ -242,7 +242,7 @@ if [ ! -f CHANGELOG ]; then
     exitError "No CHANGELOG file found!"
 fi
 
-grep -qPzo "${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n=+\n" CHANGELOG2
+grep -qPzo "${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n=+\n" CHANGELOG
 if [ $? -ne 0 ]; then
     exitError "CHANGELOG does not contain any information about the '${RELEASE_NAME}' release!"
 fi
@@ -257,7 +257,7 @@ logInfo "All checks pass, getting our hands dirty now!"
 logInfo "Merging '${BRANCH}' into '${RELEASE_BRANCH}'..."
 
 CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n(?:.|\n)+?\n(?=\n)" \
-    CHANGELOG2 | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0)
+    CHANGELOG | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0)
 COMMIT_MSG="Release ${RELEASE_NAME}"
 
 git merge "$BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$BRANCH" -S"$GPG_GIT_KEY"