bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Set MC_REPO before get_latest_mc_version

Browse Source
This commit is contained in:
Bryan Roessler
2025-04-24 12:40:43 -04:00
parent 5b3661989e
commit b0149dc977
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
installJRMC
View File

@@ -381,10 +381,12 @@ init() {
BUILD_TARGET="${BUILD_TARGET:-$ID}" BUILD_TARGET="${BUILD_TARGET:-$ID}"
CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}" CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}"
# Repo selection
# Match newer MC repos to the host unless overriden by user # 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}} MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}}
fi 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 # Don't check for latest MC version if set by user or using --install=repo only
if [[ -z $USER_MC_VERSION ]] && if [[ -z $USER_MC_VERSION ]] &&
@@ -397,7 +399,6 @@ init() {
MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}" MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}"
MC_RELEASE="${USER_MC_RELEASE:-1}" MC_RELEASE="${USER_MC_RELEASE:-1}"
MC_MVERSION="${USER_MC_MVERSION:-${MC_VERSION%%.*}}" MC_MVERSION="${USER_MC_MVERSION:-${MC_VERSION%%.*}}"
MC_REPO="${USER_MC_REPO:-$MC_REPO}"
MC_PKG="mediacenter$MC_MVERSION" MC_PKG="mediacenter$MC_MVERSION"
MC_RPM="$OUTPUT_DIR/RPMS/$ARCH/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE.$ARCH.rpm" MC_RPM="$OUTPUT_DIR/RPMS/$ARCH/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE.$ARCH.rpm"
MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION" MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION"