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

Add disclaimer to beta channels

Browse Source
This commit is contained in:
Bryan Roessler
2024-11-12 00:48:52 -05:00
parent 7f79f455a0
commit a0987475d6
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
installJRMC
View File

@@ -203,8 +203,13 @@ parse_input() {
err "--install=local is not compatible with --mcrepo as only the default ($MC_REPO) DEB is available" err "--install=local is not compatible with --mcrepo as only the default ($MC_REPO) DEB is available"
fi fi
if [[ -n $BETA_PASS ]] && ((REPO_INSTALL_SWITCH)); then
echo "Warning: not all repositories have beta channels"
echo "If the MC package is unavailable, try using --mcrepo to select another repository"
fi
if [[ -n $CONTAINER_INSTALL_SWITCH ]] && ((LOCAL_INSTALL_SWITCH || REPO_INSTALL_SWITCH)); then if [[ -n $CONTAINER_INSTALL_SWITCH ]] && ((LOCAL_INSTALL_SWITCH || REPO_INSTALL_SWITCH)); then
err "Multiple --install methods are not compatible" err "Some --install methods are incompatible"
fi fi
} }
@@ -309,11 +314,7 @@ init() {
# Match the MC repo to the system codename # Match the MC repo to the system codename
if [[ -z $USER_MC_REPO && ($ID == debian || $ID == ubuntu) ]]; then if [[ -z $USER_MC_REPO && ($ID == debian || $ID == ubuntu) ]]; then
if [[ $UBUNTU_CODENAME == "oracular" ]]; then MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}}
MC_REPO="noble" # TODO temporarily use noble repo for Ubuntu 24.10
else
MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}}
fi
fi fi
# Use the correct repo for legacy MC versions # Use the correct repo for legacy MC versions