From 153849cca772ba98511715e0e9a17e71bb51c625 Mon Sep 17 00:00:00 2001 From: bryan Date: Thu, 2 Jul 2026 16:55:24 -0400 Subject: [PATCH] 1.36.0 release --- .README.bbcode | 6 +++--- README.md | 6 +++--- installJRMC | 11 ++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.README.bbcode b/.README.bbcode index f917083..80d31e9 100644 --- a/.README.bbcode +++ b/.README.bbcode @@ -27,7 +27,7 @@ $ installJRMC --help --compat Build/install MC locally without minimum dependency version requirements. --mcversion VERSION - Specify the MC version, ex. "35.0.78" or "35" (default: latest release). + Specify the MC version, ex. "36.0.14" or "35" (default: latest release). --arch ARCH Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host). --mcrepo REPO @@ -128,8 +128,8 @@ Install the latest version of MC33 from the best available repository with debug Install a more widely-compatible version of the latest MC version. [code]installJRMC --install repo --service jriver-mediacenter --service-type user[/code] Install MC from the repository and start/enable jriver-mediacenter.service as a user service. -[code]installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.78[/code] -Build and install an MC 35.0.78 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt]. +[code]installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.14[/code] +Build and install an MC 36.0.14 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt]. [code]installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user[/code] Build an RPM locally for the current distro, move it to the webroot, and run createrepo as www-user. [code]installJRMC --service jriver-createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user[/code] diff --git a/README.md b/README.md index 8857c70..19d74c6 100755 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ OPTIONS --compat Build/install MC locally without minimum dependency version requirements. --mcversion VERSION - Specify the MC version, ex. "35.0.78" or "35" (default: latest release). + Specify the MC version, ex. "36.0.14" or "35" (default: latest release). --arch VERSION Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host). --mcrepo REPO @@ -143,9 +143,9 @@ Multiple services (but not `--service-types`) can be installed using multiple `- Install MC from the repository and start/enable `jriver-mediacenter.service` as a user service. -* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.78` +* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.14` - Build and install an MC 35.0.78 compatibility RPM locally and activate it using the `/path/to/license.mjr`. + Build and install an MC 36.0.14 compatibility RPM locally and activate it using the `/path/to/license.mjr`. * `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user` diff --git a/installJRMC b/installJRMC index 52a95d9..e6d8ce3 100755 --- a/installJRMC +++ b/installJRMC @@ -22,10 +22,10 @@ # shellcheck disable=SC2329 shopt -s extglob -declare -g SCRIPT_VERSION="1.35.17" -declare -g MC_VERSION_HARDCODE="35.0.78" # do find all replace +declare -g SCRIPT_VERSION="1.36.0" +declare -g MC_VERSION_HARDCODE="36.0.14" # do find all replace declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE -declare -g BOARD_ID="92.0" # MC35 board ID for fallback latest version detection +declare -g BOARD_ID="95.0" # MC36 board ID for fallback latest version detection declare -gi SELF_UPDATE_SWITCH=1 # 0 to disable installJRMC self-update declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/branch/master/installJRMC" # self-update URL # declare -g SCRIPT_URL="https://raw.githubusercontent.com/cryobry/installJRMC/refs/heads/master/installJRMC" # backup URL @@ -173,7 +173,8 @@ parse_input() { # Set major version defaults case "$MC_MVERSION_USER" in - 35) MC_REPO_HARDCODE="bookworm" BOARD_ID="92.0" ;; # fallback to hardcoded version if full version not provided + 36) MC_REPO_HARDCODE="bookworm" BOARD_ID="95.0" ;; # fallback to hardcoded version if full version not provided + 35) MC_VERSION_USER="${MC_VERSION_USER:-35.0.78}" MC_REPO_HARDCODE="bookworm" BOARD_ID="92.0" ;; 34) MC_VERSION_USER="${MC_VERSION_USER:-34.0.75}" MC_REPO_HARDCODE="bookworm" BOARD_ID="89.0" ;; 33) MC_VERSION_USER="${MC_VERSION_USER:-33.0.72}" MC_REPO_HARDCODE="bullseye" BOARD_ID="86.0" ;; 32) MC_VERSION_USER="${MC_VERSION_USER:-32.0.58}" MC_REPO_HARDCODE="bullseye" BOARD_ID="83.0" ;; @@ -2005,8 +2006,8 @@ main() { local keyurl="https://repos.bryanroessler.com/jriver/RPM-GPG-KEY-jriver.asc" # local keyfile="/etc/pki/rpm-gpg/RPM-GPG-KEY-jriver" - echo "Installing repository file: $repo_file" repo_file="/etc/yum.repos.d/jriver.repo" + echo "Installing repository file: $repo_file" sudo tee "$repo_file" &>/dev/null <<-EOF [jriver] baseurl = https://repos.bryanroessler.com/jriver