From ce0edfe1d0e1ebd41b8acac0c7067b94ee71888c Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Tue, 28 May 2024 16:14:18 -0400
Subject: [PATCH] Fix --repo implementation

---
 README.md   |  4 ++--
 installJRMC | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index cab2e78..d6d52d7 100755
--- a/README.md
+++ b/README.md
@@ -26,8 +26,8 @@ $ installJRMC --help
     Build or install a specific MC version, ex. "32.0.45" (default: latest version)
 --arch ARCH
     Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
---base DEBIAN_BASE
-    Specify the MC debian base, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
+--base BASE_REPO
+    Specify the MC base repo, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
 --outputdir PATH
     Generate rpmbuild output in this PATH (default: ./output)
 --restorefile RESTOREFILE
diff --git a/installJRMC b/installJRMC
index 004c491..0e0cd84 100755
--- a/installJRMC
+++ b/installJRMC
@@ -18,7 +18,7 @@ shopt -s extglob
 
 declare -g SCRIPTVERSION="1.0-dev"
 declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,83.0.html" # MC32
-declare -g DEBIANBASE="bullseye"
+declare -g BASE_REPO="bullseye"
 declare -g MC_VERSION_HARDCODE="32.0.45" # Do find all replace
 
 printHelp() {
@@ -43,8 +43,8 @@ printHelp() {
 		        Specify the MC version, ex. "$MC_VERSION_HARDCODE" (default: latest version)
 		    --arch VERSION
 		        Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
-		    --base DEBIAN_BASE
-		        Specify the MC debian base, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
+		    --base BASE_REPO
+		        Specify the MC base repo, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
 		    --outputdir PATH
 		        Generate rpmbuild output in this directory (default: ./output)
 		    --restorefile RESTOREFILE
@@ -178,7 +178,7 @@ init() {
             ID="ubuntu"
             if [[ ${VERSION_ID%.*} -ge 24 ]]; then
                 debug "Switching to noble repo for *buntu 24"
-                declare -g DEBIANBASE='noble'
+                declare -g BASE_REPO='noble'
             fi
             ;;
         *suse*)
@@ -328,7 +328,7 @@ parseInput() {
                     shift && USER_ARCH="$1"
                     ;;
                 --base)
-                    shift && declare -g DEBIANBASE="$1"
+                    shift && declare -g BASE_REPO="$1"
                     ;;
                 --restorefile)
                     shift && RESTOREFILE="$1"
@@ -402,7 +402,7 @@ parseInput() {
 
 #######################################
 # Uses several methods to determine the latest JRiver MC version
-# TODO but how to determine build distro `$DEBIANBASE=bullseye`?
+# TODO but how to determine build distro `$BASE_REPO=bullseye`?
 #######################################
 setMCVersion() {
     debug "Running: ${FUNCNAME[0]}"
@@ -420,9 +420,9 @@ setMCVersion() {
         echo "Determining latest MC version"
         if installPackage --silent buildah &&
         hash buildah &>/dev/null &&
-        cnt=$(buildah from --quiet debian:"$DEBIANBASE"-slim) &>/dev/null &&
+        cnt=$(buildah from --quiet debian:"${BASE_REPO/noble/bullseye}"-slim) &>/dev/null &&
         buildah run "$cnt" -- bash -c \
-            "echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main' > /etc/apt/sources.list 2>&1" &>/dev/null &&
+            "echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $BASE_REPO main' > /etc/apt/sources.list 2>&1" &>/dev/null &&
         buildah run "$cnt" -- bash  -c \
             "apt update --allow-insecure-repositories &>/dev/null" &>/dev/null &&
         MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null &&
@@ -627,7 +627,7 @@ installMCFromRepo() {
             execute sudo rm -rf "$repo_dir"/mediacenter*.list
             installPackage wget
             sudo bash -c "cat <<-EOF > $repo_dir/jriver.list
-				deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main
+				deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $BASE_REPO main
 			EOF"
             wget -qO- "http://dist.jriver.com/mediacenter@jriver.com.gpg.key" | 
                 sudo tee /etc/apt/trusted.gpg.d/jriver.asc &>/dev/null