From b0149dc97731966fe4201a77bc23cef2fd456114 Mon Sep 17 00:00:00 2001 From: bryan Date: Thu, 24 Apr 2025 12:40:43 -0400 Subject: [PATCH] Set MC_REPO before get_latest_mc_version --- installJRMC | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/installJRMC b/installJRMC index 0223660..55b0932 100755 --- a/installJRMC +++ b/installJRMC @@ -381,10 +381,12 @@ init() { BUILD_TARGET="${BUILD_TARGET:-$ID}" CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}" + # Repo selection # Match newer MC repos to the host unless overriden by user - if [[ $ID =~ debian|ubuntu && (-z $USER_MC_REPO || $USER_MC_MVERSION -ge 31) ]]; then + if [[ $ID =~ debian|ubuntu && $USER_MC_MVERSION -ge 31 ]]; then MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}} fi + MC_REPO="${USER_MC_REPO:-$MC_REPO}" # allow user override # Don't check for latest MC version if set by user or using --install=repo only if [[ -z $USER_MC_VERSION ]] && @@ -397,7 +399,6 @@ init() { MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}" MC_RELEASE="${USER_MC_RELEASE:-1}" MC_MVERSION="${USER_MC_MVERSION:-${MC_VERSION%%.*}}" - MC_REPO="${USER_MC_REPO:-$MC_REPO}" MC_PKG="mediacenter$MC_MVERSION" MC_RPM="$OUTPUT_DIR/RPMS/$ARCH/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE.$ARCH.rpm" MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION"