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

Modernize sources list for containerized package manager

Browse Source
This commit is contained in:
Bryan Roessler
2025-04-23 22:59:56 -04:00
parent 3e7af1de41
commit 5c5ef3ad22
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
installJRMC
View File

@@ -432,21 +432,25 @@ get_latest_mc_version() {
local cnt mc_version_source local cnt mc_version_source
# Use generalized containerized package manager to determine latest MC version # Use generalized containerized package manager to determine latest MC version
if install_package --silent buildah \ if install_package --silent buildah &&
&& cnt=$(buildah from --quiet alpine:edge 2>/dev/null) \ cnt=$(buildah from --quiet alpine:edge 2>/dev/null) &&
&& buildah run "$cnt" -- sh -c \ buildah run "$cnt" -- sh -c "apk add apt" &>/dev/null &&
"apk add apt" &>/dev/null \ buildah run "$cnt" -- sh -c \
&& buildah run "$cnt" -- sh -c \ "cat <<-EOF > /etc/apt/sources.list.d/dist.jriver.com.sources
"echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] https://dist.jriver.com/latest/mediacenter/ $1 main' > /etc/apt/sources.list 2>&1" &>/dev/null \ Types: deb
&& buildah run "$cnt" -- sh -c \ URIs: https://dist.jriver.com/latest/mediacenter/
"apt update --allow-insecure-repositories &>/dev/null" &>/dev/null \ Suites: $1
&& MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null \ Components: main
&& [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then EOF" &>/dev/null &&
buildah run "$cnt" -- sh -c \
"apt update --allow-insecure-repositories &>/dev/null" &>/dev/null &&
MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null &&
[[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
mc_version_source="containerized package manager" mc_version_source="containerized package manager"
execute buildah rm "$cnt" execute buildah rm "$cnt"
# Fallback to webscrape # Fallback to webscrape
elif MC_VERSION=$(download "$BOARD_URL" "-" | grep -o "[0-9][0-9]\.[0-9]\.[0-9]\+" | head -n 1) \ elif MC_VERSION=$(download "$BOARD_URL" "-" | grep -o "[0-9][0-9]\.[0-9]\.[0-9]\+" | head -n 1) &&
&& [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
mc_version_source="webscrape" mc_version_source="webscrape"
# Fallback to hardcoded value # Fallback to hardcoded value
else else