diff --git a/.README.bbcode b/.README.bbcode index 6cbdec7..de76f07 100644 --- a/.README.bbcode +++ b/.README.bbcode @@ -31,7 +31,7 @@ $ installJRMC --help --compat Build/install MC without minimum dependency version requirements. --mcversion VERSION - Specify the MC version, ex. "33", "34.0.71", or "34.0.71-1" (default: latest). + Specify the MC version, ex. "33", "35.0.24", or "35.0.24-1" (default: latest). --arch ARCH Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host architecture). --mcrepo REPO @@ -126,8 +126,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 34.0.71[/code] -Build and install an MC 34.0.71 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 35.0.24[/code] +Build and install an MC 35.0.24 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt]. [code]installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-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 --createrepo-user www-user[/code] diff --git a/README.md b/README.md index f81948f..ab3567a 100755 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ $ installJRMC --help --compat Build/install MC without minimum dependency version requirements. --mcversion VERSION - Build or install a specific MC version, ex. "34.0.71" or "33" (default: latest). + Build or install a specific MC version, ex. "35.0.24" or "33" (default: latest). --mcrepo REPO Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: latest official). --arch ARCH @@ -130,9 +130,9 @@ Multiple services (but not `--service-types`) can be installed at one time using 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 34.0.71` +* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.24` - Build and install an MC 34.0.71 compatibility RPM locally and activate it using the `/path/to/license.mjr`. + Build and install an MC 35.0.24 compatibility RPM locally and activate it using the `/path/to/license.mjr`. * `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user` diff --git a/installJRMC b/installJRMC index 6c3ec54..03fdba7 100755 --- a/installJRMC +++ b/installJRMC @@ -21,10 +21,10 @@ # shellcheck disable=SC2329 shopt -s extglob -declare -g SCRIPT_VERSION="1.34.12-dev" -declare -g MC_VERSION_HARDCODE="34.0.71" # do find all replace +declare -g SCRIPT_VERSION="1.35.1-dev" +declare -g MC_VERSION_HARDCODE="35.0.24" # do find all replace declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE -declare -g BOARD_ID="89.0" # MC34 board ID for automatic version detection +declare -g BOARD_ID="92.0" # MC35 board ID for legacy 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/master/installJRMC" # self-update URL # declare -g SCRIPT_URL="https://raw.githubusercontent.com/cryobry/installJRMC/refs/heads/master/installJRMC" # backup URL @@ -159,7 +159,8 @@ parse_input() { # Set major version defaults case "$MC_MVERSION_USER" in - 34) MC_REPO_HARDCODE="bookworm" BOARD_ID="89.0" ;; # fallback to hardcoded version if full version not provided + 35) MC_REPO_HARDCODE="bookworm" BOARD_ID="92.0" ;; # fallback to hardcoded version if full version not provided + 34) MC_VERSION_USER="${MC_VERSION_USER:-35.0.24}" 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" ;; 31) MC_VERSION_USER="${MC_VERSION_USER:-31.0.83}" MC_REPO_HARDCODE="bullseye" BOARD_ID="80.0" ;;