From 7fa026087a2994883dd9d5da00f1327f51cfeb79 Mon Sep 17 00:00:00 2001
From: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Date: Mon, 23 Sep 2024 13:51:41 -0400
Subject: [PATCH] Backport of fix spacing of bash scripts into release/1.19.x
 (#21768)

* backport of commit 1e97297215f985e153dd4e92c4444acebbfce0db

* backport of commit b7053f53617fec902a7bf07ebb3b8077334a5cdb

* backport of commit a391f2fa3ce1eb250e5c10546cc1459b5649e587

---------

Co-authored-by: jm96441n <john.maguire@hashicorp.com>
---
 build-support/scripts/gen-changelog.sh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/build-support/scripts/gen-changelog.sh b/build-support/scripts/gen-changelog.sh
index 0e2835e95e..3690f24e9b 100755
--- a/build-support/scripts/gen-changelog.sh
+++ b/build-support/scripts/gen-changelog.sh
@@ -6,23 +6,28 @@ set -eo pipefail
 
 pr_number=$(gh pr list -H "$(git rev-parse --abbrev-ref HEAD)" -q ".[0].number" --json "number")
 
+if [ -z "$pr_number" ]; then
+  echo "Error: Could not find PR number."
+  exit 1
+fi
+
 # check if this changelog is referencing an enterprise change
 curdir=$(pwd)
 
-filename = ".changelog/$pr_number.txt"
+filename=".changelog/$pr_number.txt"
 if [[ ! $curdir == *"enterprise"* ]]; then
-  is_enterprise = "n"
-  read -p "Is this an enterprise PR? (y/n): " is_enterprise
+  is_enterprise="n"
+  read -rp "Is this an enterprise PR? (y/n): " is_enterprise
 
   if [[ $is_enterprise == "y" ]]; then
-    filename = ".changelog/_$pr_number.txt"
+    filename=".changelog/_$pr_number.txt"
   fi
 else
-  filename = ".changelog/_$pr_number.txt"
+  filename=".changelog/_$pr_number.txt"
 fi
 
 # create a new changelog file
-touch $filename
+touch "$filename"
 
 echo "Created a new changelog file for PR $pr_number."
 
@@ -35,7 +40,7 @@ echo "4. deprecation"
 echo "5. bug"
 
 if [ -z "$1" ]; then
-  read -p "Enter your choice: " choice
+  read -rp "Enter your choice: " choice
 else
   choice=$1
 fi
@@ -66,8 +71,10 @@ esac
 
 msg=""
 
-read -ep $'Please enter the changelog message:\n' msg
+read -erp $'Please enter the changelog message:\n' msg
 
 echo -e "\`\`\`release-note:$type\n$msg\n\`\`\`" >>"$filename"
 
-cat .changelog/$pr_number.txt
+echo -e "\nChangelog added to $filename. Contents:\n"
+
+cat "$filename"