1.36.1 release

.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]
+[code]installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.20[/code]
-Build and install an MC 36.0.14 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt].
+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]

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`
 

installJRMC

@@ -22,8 +22,8 @@
 # shellcheck disable=SC2329
 shopt -s extglob
 
-declare -g SCRIPT_VERSION="1.36.0"
+declare -g SCRIPT_VERSION="1.36.1"
-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
 }
@@ -610,7 +617,7 @@ install_external_repos() {
           "https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
       fi
       # Install freeworld mesa packages for better hardware acceleration
-      for pkg in mesa-va-drivers mesa-vdpau-drivers mesa-vulkan-drivers; do
+      for pkg in mesa-va-drivers mesa-vulkan-drivers; do
         freeworld_pkg="${pkg}-freeworld"
         if ! "${PKG_QUERY[@]}" "$freeworld_pkg" &>/dev/null; then
           if "${PKG_QUERY[@]}" "$pkg" &>/dev/null; then
@@ -823,7 +830,6 @@ translate_packages() {
       recommends_arr=("${recommends_arr[@]/fdkaac/fdk-aac-free}")
       recommends_arr+=("mesa-va-drivers-freeworld|mesa-va-drivers")
       recommends_arr+=("mesa-vulkan-drivers-freeworld|mesa-vulkan-drivers")
-      recommends_arr+=("mesa-vdpau-driver-freeworld|mesa-vdpau-driver")
       ;;
     suse)
       requires_arr=("${requires_arr[@]/python*/python3}")
@@ -1545,8 +1551,6 @@ service_jriver-mediacenter() {
 		Type=simple
 		$USER_STRING
 		ExecStart=/usr/bin/mediacenter$MC_MVERSION $*
-		KillMode=none
-		ExecStop=/usr/bin/mc$MC_MVERSION /MCC 20007
 		Restart=always
 		RestartSec=10
 		TimeoutStopSec=30
@@ -2243,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