diff --git a/.README.bbcode b/.README.bbcode index 80d31e9..fc6dc24 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. "36.0.14" or "35" (default: latest release). + Specify the MC version, ex. "36.0.20" 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 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 --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.20[/code] +Build and install an MC 36.0.20 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 19d74c6..ca698c8 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. "36.0.14" or "35" (default: latest release). + Specify the MC version, ex. "36.0.20" 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 36.0.14` +* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.20` - Build and install an MC 36.0.14 compatibility RPM locally and activate it using the `/path/to/license.mjr`. + Build and install an MC 36.0.20 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 39b626a..97f678a 100755 --- a/installJRMC +++ b/installJRMC @@ -23,7 +23,7 @@ shopt -s extglob declare -g SCRIPT_VERSION="1.36.1-dev" -declare -g MC_VERSION_HARDCODE="36.0.14" # do find all replace +declare -g MC_VERSION_HARDCODE="36.0.20" # do find all replace declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE 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 @@ -440,7 +440,14 @@ init() { # Append explicit package version when user provides --mcversion case $ID in fedora|centos|suse|mandriva) MC_PKG+="-$MC_VERSION" ;; - debian|ubuntu) MC_PKG+="=$MC_VERSION" ;; + debian|ubuntu) + # ARM packages append arch to the package name and version + if [[ $MC_ARCH == "arm64" || $MC_ARCH == "armhf" ]]; then + MC_PKG+=":${MC_ARCH}=${MC_VERSION}-${MC_ARCH}" + else + MC_PKG+="=$MC_VERSION" + fi + ;; esac fi } @@ -2240,7 +2247,7 @@ create_mc_apt_container() { Signed-By: /usr/share/keyrings/jriver-com-archive-keyring.gpg Suites: $MC_REPO Components: main - Architectures: $MC_ARCH + Architectures: amd64 armhf arm64 EOF apt-get update -qq' && # If user passes command strings run them in the container