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

Clarify MC version

Browse Source
This commit is contained in:
Bryan Roessler
2026-04-20 23:00:50 -04:00
parent 21d010d7d2
commit 99b6c95a68
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
installJRMC
View File

@@ -421,7 +421,12 @@ init() {
echo "MC source -> target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH" echo "MC source -> target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH"
set_mc_version set_mc_version
echo "Selected MC version $MC_VERSION from the $MC_REPO repo (via $MC_VERSION_SOURCE)" if ((REPO_INSTALL_SWITCH)) && [[ -z $MC_VERSION_USER ]]; then
debug "Selected latest MC version from the $MC_REPO repo (via $MC_VERSION_SOURCE)"
else
debug "Selected MC version $MC_VERSION from the $MC_REPO repo (via $MC_VERSION_SOURCE)"
fi
debug "If using --install=repo and no --mcversion, the latest version will be installed"
# Set additional MC version variables # Set additional MC version variables
MC_RELEASE="${MC_RELEASE_USER:-1}" MC_RELEASE="${MC_RELEASE_USER:-1}"
@@ -454,7 +459,11 @@ set_mc_version() {
# Package manager will handle updates in other instances # Package manager will handle updates in other instances
if ! ((BUILD_SWITCH || LOCAL_INSTALL_SWITCH || CREATEREPO_SWITCH)); then if ! ((BUILD_SWITCH || LOCAL_INSTALL_SWITCH || CREATEREPO_SWITCH)); then
MC_VERSION="$MC_VERSION_HARDCODE" MC_VERSION="$MC_VERSION_HARDCODE"
if ((REPO_INSTALL_SWITCH)); then
MC_VERSION_SOURCE="package manager"
else
MC_VERSION_SOURCE="hardcoded" MC_VERSION_SOURCE="hardcoded"
fi
return 0 return 0
fi fi
@@ -1983,7 +1992,7 @@ main() {
case $ID in case $ID in
fedora|centos) fedora|centos)
local keyurl="https://repos.bryanroessler.com/jriver/RPM-GPG-KEY-jriver.asc" local keyurl="https://repos.bryanroessler.com/jriver/RPM-GPG-KEY-jriver.asc"
local keyfile="/etc/pki/rpm-gpg/RPM-GPG-KEY-jriver" # local keyfile="/etc/pki/rpm-gpg/RPM-GPG-KEY-jriver"
echo "Installing repository file: $repo_file" echo "Installing repository file: $repo_file"
repo_file="/etc/yum.repos.d/jriver.repo" repo_file="/etc/yum.repos.d/jriver.repo"