From f69149e64778e00df46fd02ec96511e7f9e5713d Mon Sep 17 00:00:00 2001
From: Daniel Ruiz de Alegría <daniel@drasite.com>
Date: Tue, 14 Apr 2020 21:12:10 +0200
Subject: Update Makefile generate_changelog script

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 46de1342f..e1b4dc389 100644
--- a/Makefile
+++ b/Makefile
@@ -91,14 +91,14 @@ undo_release: _get_tag
 
 generate_changelog: _get_version _get_tag
 	git checkout $(TAG) CHANGELOG
-	echo [$(VERSION)] > /tmp/out
-	git log --pretty=format:' * %s' $(TAG)..HEAD >> /tmp/out
-	echo >> /tmp/out
-	echo | cat - CHANGELOG >> /tmp/out
-	mv /tmp/out CHANGELOG
+	mv CHANGELOG CHANGELOG.old
+	echo [$(VERSION)] > CHANGELOG
+	printf "%s\n\n" "$$(git log --pretty=format:' * %s' $(TAG)..HEAD)" >> CHANGELOG
+	cat CHANGELOG.old >> CHANGELOG
+	rm CHANGELOG.old
 	$$EDITOR CHANGELOG
 	git commit CHANGELOG -m "Update CHANGELOG version $(VERSION)"
-	git push origin master
+	git push origin HEAD
 
 .PHONY: all install $(THEMES) uninstall _get_version _get_tag dist release aur_release copr_release launchpad_release undo_release generate_changelog
 
-- 
cgit v1.2.3