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

Only match host repo on newer MC versions

Browse Source
This commit is contained in:
Bryan Roessler
2025-04-24 03:23:35 -04:00
parent 05c3a375cc
commit c33603bb0a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
installJRMC
View File

@@ -381,8 +381,8 @@ init() {
BUILD_TARGET="${BUILD_TARGET:-$ID}" BUILD_TARGET="${BUILD_TARGET:-$ID}"
CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}" CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}"
# Match the MC repo to the host unless specified by user # Match newer MC repos to the host unless overriden by user
if [[ $ID =~ debian|ubuntu && -z $USER_MC_REPO && -z $USER_MC_MVERSION ]]; then if [[ $ID =~ debian|ubuntu && (-z $USER_MC_REPO || $USER_MC_MVERSION -ge 31) ]]; then
MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}} MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}}
fi fi
@@ -725,15 +725,13 @@ acquire_deb() {
fi fi
fi fi
# Define the repositories to check # Define the repositories to search
local repos=( local -a repos
[[ -n $BETAPASS ]] && repos=("https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/beta/$BETAPASS/$fname")
repos+=(
"https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/$fname" "https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/$fname"
"https://files.jriver-cdn.com/mediacenter/test/$fname") "https://files.jriver-cdn.com/mediacenter/test/$fname")
if [[ -n $BETAPASS ]]; then
repos=("https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/beta/$BETAPASS/$fname" "${repos[@]}")
fi
# Loop through the repositories and attempt to download # Loop through the repositories and attempt to download
local found=0 local found=0
for repo in "${repos[@]}"; do for repo in "${repos[@]}"; do
@@ -953,9 +951,10 @@ install_mc_deb() {
execute sed -E -i 's/,[[:space:]]*libwebkit2gtk[^,]*(,|\?)?//g' control execute sed -E -i 's/,[[:space:]]*libwebkit2gtk[^,]*(,|\?)?//g' control
# TODO workaround for legacy ZorinOS # TODO workaround for legacy ZorinOS
[[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] && if [[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] &&
grep -q zorin /etc/os-release && grep -q zorin /etc/os-release; then
execute sed -i 's/libva2/libva1/g' control execute sed -i 's/libva2/libva1/g' control
fi
execute tar -cJf "control.tar.xz" "control" "postinst" execute tar -cJf "control.tar.xz" "control" "postinst"
declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}" declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}"