From 8a0dbe7c1ae0255d6b9a4a864f0d6f59853600e0 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Thu, 5 Nov 2020 10:26:00 +0100
Subject: [PATCH] helpers: Remove old changelog files for release

---
 helpers/prepare-release/main.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/helpers/prepare-release/main.go b/helpers/prepare-release/main.go
index 2fef91325..70dc31afe 100644
--- a/helpers/prepare-release/main.go
+++ b/helpers/prepare-release/main.go
@@ -203,16 +203,17 @@ func preCheckChangelogRelease() bool {
 
 func createChangelogRelease() {
 	date := time.Now().Format("2006-01-02")
-	target := filepath.Join("changelog", fmt.Sprintf("%s_%s", opts.Version, date))
-	mkdir(target)
+	targetDir := filepath.Join("changelog", fmt.Sprintf("%s_%s", opts.Version, date))
+	unreleasedDir := filepath.Join("changelog", "unreleased")
+	mkdir(targetDir)
 
-	for _, name := range readdir(filepath.Join("changelog", "unreleased")) {
+	for _, name := range readdir(unreleasedDir) {
 		if name == ".gitignore" {
 			continue
 		}
 
 		src := filepath.Join("changelog", "unreleased", name)
-		dest := filepath.Join(target, name)
+		dest := filepath.Join(targetDir, name)
 
 		err := os.Rename(src, dest)
 		if err != nil {
@@ -220,11 +221,11 @@ func createChangelogRelease() {
 		}
 	}
 
-	run("git", "add", target)
-	run("git", "add", "-u", filepath.Join("changelog", "unreleased"))
+	run("git", "add", targetDir)
+	run("git", "add", "-u", unreleasedDir)
 
 	msg := fmt.Sprintf("Prepare changelog for %v", opts.Version)
-	run("git", "commit", "-m", msg, target)
+	run("git", "commit", "-m", msg, targetDir, unreleasedDir)
 }
 
 func preCheckChangelogVersion() {