From 6f6c5e11a5f33de5f8e59673e6691463b142e3af Mon Sep 17 00:00:00 2001
From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:38:45 -0600
Subject: [PATCH] [changelog-post] various script updates

- release input for script
- rework announcements for branches
- add master branch info
---
 changelogs/templates/announcements.md  | 3 +--
 changelogs/templates/branch-develop.md | 1 +
 changelogs/templates/branch-master.md  | 6 ++++++
 scripts/radarr_changelog_post.sh       | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/templates/branch-master.md

diff --git a/changelogs/templates/announcements.md b/changelogs/templates/announcements.md
index dc7939241..b20f97549 100644
--- a/changelogs/templates/announcements.md
+++ b/changelogs/templates/announcements.md
@@ -13,5 +13,4 @@
 - [Jackett `/all` is deprecated and no longer supported. The FAQ has warned about this since May 2021.](https://wiki.servarr.com/radarr/faq#jacketts-all-endpoint)
 - Radarr is now on .Net6
 - New builds for OSX Arm64 and Linux Musl Arm32
-- IMDb Ratings
-- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`
\ No newline at end of file
+- IMDb Ratings
\ No newline at end of file
diff --git a/changelogs/templates/branch-develop.md b/changelogs/templates/branch-develop.md
index badbb6ed7..1712228b7 100644
--- a/changelogs/templates/branch-develop.md
+++ b/changelogs/templates/branch-develop.md
@@ -1,3 +1,4 @@
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`
 A reminder about the `develop` branch
 
 - **develop - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first. This version will receive updates either weeklyish or bi-weeklyish depending on development.**
\ No newline at end of file
diff --git a/changelogs/templates/branch-master.md b/changelogs/templates/branch-master.md
new file mode 100644
index 000000000..4d05518fe
--- /dev/null
+++ b/changelogs/templates/branch-master.md
@@ -0,0 +1,6 @@
+- **Users who do not wish to be on the alpha `nightly` or beta `develop` testing branches should take advantage of this parity and switch to `master`
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first. This version will receive updates either weeklyish or bi-weeklyish depending on development.**
+- **nightly - Current Nightly/Unstable - (Alpha/Unstable) : The bleeding edge. Released as soon as code is committed and passed all automated tests. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.**
\ No newline at end of file
diff --git a/scripts/radarr_changelog_post.sh b/scripts/radarr_changelog_post.sh
index b8dc9b9db..463176cef 100644
--- a/scripts/radarr_changelog_post.sh
+++ b/scripts/radarr_changelog_post.sh
@@ -2,10 +2,10 @@
 # Generate a Markdown change log of pull requests from commits between two tags
 scriptDir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 ghRepo="Radarr"
-branch="develop"
+#branch="develop"
 #read -r -p "What Repo?: " ghRepo
 #read -r -p "What Org?: [Default:$ghRepo]" ghOrg
-#read -r -p "What Branch?:" branch
+read -r -p "What Branch? [master|develop|nightly]:" branch
 ghOrg=${ghOrg:-$ghRepo}
 ghRepoUrl=https://github.com/$ghOrg/$ghRepo
 
@@ -83,7 +83,7 @@ markdown+="## NAS Packages"
 markdown+="\n\n"
 markdown+="- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally"
 markdown+="\n\n"
-markdown+="- QNAP - Please ask the SynoCommunity to update the base package; however, you should be able to update in-app normally"
+markdown+="- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally"
 markdown+="\n\n"
 markdown+="------------"
 markdown+="\n\n"
@@ -93,7 +93,7 @@ markdown+="## $latestTag (changes since $previousTag)"
 markdown+="\n\n"
 markdown+="$commits"
 markdown+="\n\n"
-markdown+="- Other bug fixes and improvements, see GitHub history"
+markdown+=" - Other bug fixes and improvements, see GitHub history"
 # Loop over each commit and look for merged pull requests
 #for COMMIT in $COMMITS; do