From cd424ac955d784cf0c11ce95a8f9185cabcc0710 Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Tue, 23 Jul 2024 23:30:11 +0200
Subject: [PATCH] #4642 dont use release branches on RCs (#4656)

---
 home.admin/config.scripts/blitz.fatpack.sh | 21 ++++++++++++++-------
 home.admin/config.scripts/blitz.web.api.sh | 10 +++++++++-
 home.admin/config.scripts/blitz.web.ui.sh  | 11 ++++++++---
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/home.admin/config.scripts/blitz.fatpack.sh b/home.admin/config.scripts/blitz.fatpack.sh
index 21d64f53..61449dcd 100755
--- a/home.admin/config.scripts/blitz.fatpack.sh
+++ b/home.admin/config.scripts/blitz.fatpack.sh
@@ -92,13 +92,20 @@ sudo -u admin curl -H "Accept: application/json; indent=4" https://bitnodes.io/a
 # Fallback Nodes List from Bitcoin Core
 sudo -u admin curl https://raw.githubusercontent.com/bitcoin/bitcoin/master/contrib/seeds/nodes_main.txt -o /home/admin/fallback.bitcoin.nodes
 
-echo "* Adding Raspiblitz API ..."
-sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "blitz-${branch}" || exit 1
-echo "* Adding Raspiblitz WebUI ..."
-
-# change back when final release to:
-# sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "release/${branch}" || exit 1
-sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "master" || exit 1
+# use dev branch when its an Release Candidate
+source <(/home/admin/_cache.sh get codeVersion)
+if [[ "$codeVersion" == *"rc"* ]]; then
+  echo "# RELEASE CANDIDATE: using development branches for WebUI & API"
+  echo "* Adding Raspiblitz API ..."
+  sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "dev" || exit 1
+  echo "* Adding Raspiblitz WebUI ..."
+  sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "master" || exit 1
+else
+  echo "* Adding Raspiblitz API ..."
+  sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "blitz-${branch}" || exit 1
+  echo "* Adding Raspiblitz WebUI ..."
+  sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "release/${branch}" || exit 1
+fi
 
 # set build code as new www default
 sudo rm -r /home/admin/assets/nginx/www_public
diff --git a/home.admin/config.scripts/blitz.web.api.sh b/home.admin/config.scripts/blitz.web.api.sh
index b5b9891a..da9c862c 100644
--- a/home.admin/config.scripts/blitz.web.api.sh
+++ b/home.admin/config.scripts/blitz.web.api.sh
@@ -178,7 +178,15 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     echo "# activeBranch detected by build_sdcard.sh: ${activeBranch}"
     GITHUB_USER="${defaultAPIuser}"
     GITHUB_REPO="${defaultAPIrepo}"
-    GITHUB_BRANCH="blitz-${githubBranch}"
+    # use dev branch when its an Release Candidate
+    source <(/home/admin/_cache.sh get codeVersion)
+    if [[ "$codeVersion" == *"rc"* ]]; then
+      echo "# RELEASE CANDIDATE: using dev branch"
+      GITHUB_BRANCH="dev"
+    else
+      GITHUB_BRANCH="blitz-${githubBranch}"
+    fi
+
     GITHUB_COMMITORTAG=""
   else
     # get parameters
diff --git a/home.admin/config.scripts/blitz.web.ui.sh b/home.admin/config.scripts/blitz.web.ui.sh
index d5878c89..15850800 100755
--- a/home.admin/config.scripts/blitz.web.ui.sh
+++ b/home.admin/config.scripts/blitz.web.ui.sh
@@ -65,9 +65,14 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     GITHUB_USER="${defaultWEBUIuser}"
     GITHUB_REPO="${defaultWEBUIrepo}"
     
-    # change back when final release to: GITHUB_BRANCH="release/${githubBranch}"
-    GITHUB_BRANCH="master"
-
+    # use master branch when its an Release Candidate
+    source <(/home/admin/_cache.sh get codeVersion)
+    if [[ "$codeVersion" == *"rc"* ]]; then
+      echo "# RELEASE CANDIDATE: using master branch"
+      GITHUB_BRANCH="master"
+    else
+      GITHUB_BRANCH="release/${githubBranch}"
+    fi
     GITHUB_COMMITORTAG=""
   else
     # get parameters