1.34.9 release

Don't unset recommends namerefs
Remove buildah force flag
2025-10-21 17:56:29 -04:00 · 2025-10-21 17:55:01 -04:00 · 2025-10-21 17:49:08 -04:00 · 2025-10-21 17:23:43 -04:00 · 2025-10-21 17:04:12 -04:00 · 2025-10-21 15:06:03 -04:00
3 changed files with 200 additions and 186 deletions
--- a/.README.bbcode
+++ b/.README.bbcode
@@ -1,10 +1,10 @@
 [size=20pt]installJRMC[/size]

-This program will install [url=https://www.jriver.com/]JRiver Media Center[/url] and associated services on most Linux distributions.
+This program installs [url=https://www.jriver.com/]JRiver Media Center[/url] and associated services on most Linux distributions.

 You can find the latest version of installJRMC, changelog, and documentation in [url=https://git.bryanroessler.com/bryan/installJRMC]my repository[/url].

-[size=18pt]tl;dr One-line MC install[/size] 
+[size=18pt]tl;dr (One-line MC install)[/size] 
 [code]curl https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC|bash[/code]

 [size=18pt]Instructions[/size]
@@ -23,48 +23,48 @@ Specifying [tt]--build[/tt], [tt]--createrepo[/tt], [tt]--service[/tt], or [tt]-
 [code]
 $ installJRMC --help
 --install, -i repo|local
-    repo: Install MC from repository, future updates will be handled by the system package manager
-    local: Build and install MC package from official source package
+    repo: Install MC from repository, future updates will be handled by the system package manager.
+    local: Build and install MC package from official source package.
 --build[=suse|fedora|centos]
-    Build RPM from source DEB but do not install
-    Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=')
+    Build RPM from source DEB but do not install.
+    Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=').
 --compat
-    Build/install MC without minimum dependency version requirements
+    Build/install MC without minimum dependency version requirements.
 --mcversion VERSION
-    Specify the MC version, ex. "33", "34.0.51", or "34.0.51-1" (default: latest)
+    Specify the MC version, ex. "33", "34.0.71", or "34.0.71-1" (default: latest).
 --arch ARCH
-    Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
+    Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host architecture).
 --mcrepo REPO
-    Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: host or official)
+    Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: host or official).
 --outputdir PATH
-    Generate reusable installJRMC output in this PATH (default: ./output)
+    Generate reusable installJRMC output in this PATH (default: ./output).
 --restorefile RESTOREFILE
-    Restore file location for automatic license registration
+    Restore file location for automatic license registration.
 --betapass PASSWORD
-    Enter beta team password for access to beta builds
+    Enter beta team password for access to beta builds.
 --service, -s SERVICE
-    See SERVICES section below for the list of services to deploy
+    See SERVICES section below for the list of services to deploy.
  --service-type user|system
-      Starts services at boot (system) or user login (user) (default: per-service, see SERVICES)
+      Starts services at boot (system) or user login (user) (default: per-service, see SERVICES).
 --container, -c CONTAINER (TODO: Under construction)
-    See CONTAINERS section below for a list of containers to deploy
+    See CONTAINERS section below for a list of containers to deploy.
 --createrepo[=suse|fedora|centos]
    Build rpm, copy to webroot, and run createrepo.
-    Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=')
+    Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=').
  --createrepo-webroot PATH
-      The webroot directory to install the repo (default: /var/www/jriver/)
+      The webroot directory to install the repo (default: /var/www/jriver/).
  --createrepo-user USER
-      The web server user if different from the current user
+      The web server user if different from the current user.
 --no-update
-    Disable the installJRMC update check
+    Disable the installJRMC update check.
 --yes, -y, --auto
-    Always assumes yes for questions
+    Always assumes yes for questions.
 --version, -v
-    Print installJRMC version and exit
+    Print installJRMC version and exit.
 --debug, -d
-    Print debug output
+    Print debug output.
 --help, -h
-    Print help dialog and exit
+    Print help dialog and exit.
 --uninstall, -u
    Uninstall JRiver MC, service files, firewall rules, etc.
 [/code]
@@ -72,20 +72,20 @@ $ installJRMC --help
 [size=18pt]Services[/size]

 [code]jriver-mediaserver (user)
-    Enable and start a mediaserver systemd service (requires an existing X server)
+    Enable and start a mediaserver systemd service (requires an existing X server).
 jriver-mediacenter (user)
-    Enable and start a mediacenter systemd service (requires an existing X server)
+    Enable and start a mediacenter systemd service (requires an existing X server).
 jriver-x11vnc (user)
-    Enable and start x11vnc for the local desktop (requires an existing X server, does NOT support Wayland)
-  --vncpass and --display are also valid options (see below)
+    Enable and start x11vnc for the local desktop (requires an existing X server, does NOT support Wayland).
+  --vncpass and --display are also valid options (see below).
 jriver-xvnc (system)
-    Enable and start a new Xvnc session running JRiver Media Center
+    Enable and start a new Xvnc session running JRiver Media Center.
  --vncpass PASSWORD
-    Set vnc password for x11vnc/Xvnc access. If no password is set, the script will either use existing password stored in ~/.vnc/jrmc_passwd or else no password
+    Set vnc password for x11vnc/Xvnc access. If no password is set, the script will either use existing password stored in ~/.vnc/jrmc_passwd or else no password.
  --display DISPLAY
-    Manually specify display to use for x11vnc/Xvnc (ex. ':1')
+    Manually specify display to use for x11vnc/Xvnc (ex. ':1').
 jriver-createrepo (system)
-    Install hourly service to build latest MC RPM and run createrepo
+    Install hourly service to build latest MC RPM and run createrepo.
 [/code]

 Services use a sane default [tt]--service-type[/tt] listed next to the service name in the Services description. 
@@ -110,11 +110,11 @@ installJRMC automatically creates port forwarding firewall rules for remote acce

 [size=18pt]Other Nicities[/size]
 [list]
-[*]Automatically updates [tt]installJRMC[/tt] to the latest release
-[*]Activates external third-party repositories for improved media playback (hardware decoding, etc.)
-[*]Adds temporary legacy repositories to provide deprecated libraries
-[*]Links non-standard SSL certs
-[*]Activates MC if a valid license file is found in common locations
+[*]Automatically updates [tt]installJRMC[/tt] to the latest release.
+[*]Activates external third-party repositories for improved media playback (hardware decoding, etc.).
+[*]Adds temporary legacy repositories to provide deprecated libraries.
+[*]Links non-standard SSL certs.
+[*]Activates MC if a valid license file is found in common locations.
 [/list]

 [size=18pt]Examples[/size]
@@ -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.51[/code]
-Build and install an MC 34.0.51 comptability RPM locally and activate it using the /path/to/license.mjr
+[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 --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]
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # installJRMC

-This program will install [JRiver Media Center](https://www.jriver.com/) and associated services on most Linux distributions.
+Install [JRiver Media Center](https://www.jriver.com/) and associated services on most Linux distributions.

 You can find the latest version of installJRMC, changelog, and documentation in [my repository](https://git.bryanroessler.com/bryan/installJRMC).

-## Executing
+## Usage

 `installJRMC [--option [ARGUMENT]]`

-`installJRMC` defaults to `--install=repo` on distros with MC repositories and `--install=local` on all others.
+`installJRMC` defaults to `--install=repo` on distros with Media Center repositories and `--install=local` on others.
 Specifying `--build`, `--createrepo`, `--service`, or `--uninstall` disables the default install method.

 ### tl;dr
@@ -20,70 +20,70 @@ Specifying `--build`, `--createrepo`, `--service`, or `--uninstall` disables the
 ```text
 $ installJRMC --help
 --install, -i repo|local
-    repo: Install MC from repository, future updates will be handled by the system package manager
-    local: Build and install MC package locally from official source package
+    repo: Install MC from repository, future updates will be handled by the system package manager.
+    local: Build and install MC package locally from official source package.
 --build[=suse|fedora|centos|mandriva]
-    Build RPM from source DEB but do not install
-    Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=')
+    Build RPM from source DEB but do not install.
+    Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=').
 --compat
-    Build/install MC without minimum dependency version requirements
+    Build/install MC without minimum dependency version requirements.
 --mcversion VERSION
-    Build or install a specific MC version, ex. "34.0.51" or "33" (default: latest)
+    Build or install a specific MC version, ex. "34.0.71" or "33" (default: latest).
 --mcrepo REPO
-    Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
+    Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: latest official).
 --arch ARCH
-    Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
+    Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture).
 --outputdir PATH
-    Generate rpmbuild output in this PATH (default: ./output)
+    Generate rpmbuild output in this PATH (default: ./output).
 --restorefile RESTOREFILE
-    Restore file location for automatic license registration
+    Restore file location for automatic license registration.
 --betapass PASSWORD
-    Enter beta team password for access to beta builds
+    Enter beta team password for access to beta builds.
 --service, -s SERVICE
-    See SERVICES section below for the list of services to deploy
+    See SERVICES section below for the list of services to deploy.
  --service-type user|system
-      Starts services at boot (system) or user login (user) (default: per-service, see SERVICES)
+      Starts services at boot (system) or user login (user) (default: per-service, see SERVICES).
 --container, -c CONTAINER (TODO: Under construction)
-    See CONTAINERS section below for a list of containers to deploy
+    See CONTAINERS section below for a list of containers to deploy.
 --createrepo[=suse|fedora|centos|mandriva]
    Build rpm, copy to webroot, and run createrepo.
-    Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=')
+    Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=').
  --createrepo-webroot PATH
-      The webroot directory to install the repo (default: /var/www/jriver/)
+      The webroot directory to install the repo (default: /var/www/jriver/).
  --createrepo-user USER
-      The web server user if different from the current user
+      The web server user if different from the current user.
 --no-update
-    Disable the installJRMC update check
+    Disable the installJRMC update check.
 --yes, -y, --auto
-    Always assume yes for questions
+    Always assume yes for questions.
 --version, -v
-    Print installJRMC version and exit
+    Print installJRMC version and exit.
 --debug, -d
-    Print debug output
+    Print debug output.
 --help, -h
-    Print help dialog and exit
+    Print help dialog and exit.
 --uninstall, -u
-    Uninstall JRiver MC, service files, and firewall rules (does not remove library or media files)
+    Uninstall JRiver MC, service files, and firewall rules (does not remove library or media files).
 ```

 ### `--service=`

 ```text
 jriver-mediaserver [--service-type=user]
-    Enable and start a mediaserver systemd service (requires an existing X server)
+    Enable and start a mediaserver systemd service (requires an existing X server).
 jriver-mediacenter [--service-type=user]
-    Enable and start a mediacenter systemd service (requires an existing X server)
+    Enable and start a mediacenter systemd service (requires an existing X server).
 jriver-x11vnc [--service-type=user]
-    Enable and start x11vnc for the local desktop (requires an existing X server, does NOT support Wayland)
-  --vncpass and --display are also valid options (see below)
+    Enable and start x11vnc for the local desktop (requires an existing X server, does NOT support Wayland).
+  --vncpass and --display are also valid options (see below).
 jriver-xvnc [--service-type=system]
-    Enable and start a new Xvnc session running JRiver Media Center
+    Enable and start a new Xvnc session running JRiver Media Center.
  --vncpass PASSWORD
-    Set vnc password for x11vnc/Xvnc access. If no password is set, the script will either use existing password stored in ~/.vnc/jrmc_passwd or use no password
+    Set vnc password for x11vnc/Xvnc access. If no password is set, the script will either use existing password stored in ~/.vnc/jrmc_passwd or use no password.
  --display DISPLAY
-    Manually specify display to use for x11vnc/Xvnc (ex. ':1')
+    Manually specify display to use for x11vnc/Xvnc (ex. ':1').
 jriver-createrepo [--service-type=system]
-    Install hourly service to build latest MC RPM and run createrepo
+    Install hourly service to build latest MC RPM and run createrepo.
 ```

 #### `--service-type=`
@@ -104,14 +104,13 @@ Multiple services (but not `--service-types`) can be installed at one time using

 `installJRMC` automatically creates port forwarding firewall rules for remote access to Media Network (52100-52200/tcp, 1900/udp DLNA) and Xvnc/x11vnc (if selected), using `firewall-cmd` or `ufw` (if available).

-
 ## Other Nicities

-* Automatically updates `installJRMC` to the latest release
-* Activates external third-party repositories for improved media playback (hardware decoding, etc.)
-* Adds temporary legacy repositories to provide deprecated libraries
-* Links non-standard SSL certs
-* Activates MC if a valid license file is found in common locations
+* Automatically updates `installJRMC` to the latest release.
+* Activates external third-party repositories for improved media playback (hardware decoding, etc.).
+* Adds temporary legacy repositories to provide deprecated libraries.
+* Links non-standard SSL certs.
+* Activates MC if a valid license file is found in common locations.

 ## Examples

@@ -131,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.51`
+* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 34.0.71`

-    Build and install an MC 34.0.51 compatibility RPM locally and activate it using the `/path/to/license.mjr`
+    Build and install an MC 34.0.71 compatibility RPM locally and activate it using the `/path/to/license.mjr`.

 * `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`

--- a/225
+++ b/225
@@ -18,12 +18,12 @@
 # * Avoid execute() for stdout
 #
 # Allow indirection to match service names to their functions
-# shellcheck disable=SC2317
+# shellcheck disable=SC2329
 shopt -s extglob

-declare -g SCRIPT_VERSION="1.34.8"
-declare -g MC_VERSION="34.0.51" # do find all replace (hardcoded fallback)
-declare -g MC_REPO="bookworm" # should match the MC_VERSION
+declare -g SCRIPT_VERSION="1.34.9"
+declare -g MC_VERSION_HARDCODE="34.0.71" # 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 -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
@@ -46,71 +46,71 @@ print_help() {

 		OPTIONS
 		  --install, -i repo|local
-		    repo: Install MC from repository, updates are handled by the system package manager
-		    local: Build and install MC locally from official source package
+		    repo: Install MC from repository, updates are handled by the system package manager.
+		    local: Build and install MC locally from official source package.
 		  --build[=suse|fedora|centos|mandriva]
-		    Build RPM from source DEB but do not install
-		    Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=')
+		    Build RPM from source DEB but do not install.
+		    Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=').
 		  --compat
-		    Build/install MC locally without minimum dependency version requirements
+		    Build/install MC locally without minimum dependency version requirements.
 		  --mcversion VERSION
-		    Specify the MC version, ex. "$MC_VERSION" or "${MC_VERSION%%.*}" (default: latest release)
+		    Specify the MC version, ex. "$MC_VERSION_HARDCODE" or "${MC_VERSION_HARDCODE%%.*}" (default: latest release).
 		  --arch VERSION
-		    Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host)
+		    Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host).
 		  --mcrepo REPO
-		    Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: auto)
+		    Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: auto).
 		  --outputdir PATH
-		    Generate reusable installJRMC output in this PATH (default: ./output)
+		    Generate reusable installJRMC output in this PATH (default: ./output).
 		  --restorefile MJR_FILE
-		    Restore file location for automatic license registration
+		    Restore file location for automatic license registration.
 		  --betapass PASSWORD
-		    Enter beta team password for access to beta builds
+		    Enter beta team password for access to beta builds.
 		  --service, -s SERVICE
-		    See SERVICES section below for a list of possible services to install
+		    See SERVICES section below for a list of possible services to install.
 		    --service-type user|system
-		      Starts services at boot (system) or at user login (user) (default: per service, see SERVICES)
+		      Starts services at boot (system) or at user login (user) (default: per service, see SERVICES).
 		  --container, -c CONTAINER (TODO: Under construction)
-		    See CONTAINERS section below for a list of possible services to install
+		    See CONTAINERS section below for a list of possible services to install.
 		  --createrepo[=suse|fedora|centos|mandriva]
 		    Build rpm, copy to webroot, and run createrepo. 
-		    Use in conjunction with --build=TARGET for crossbuilding repos
-		    Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=')
+		    Use in conjunction with --build=TARGET for crossbuilding repos.
+		    Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=').
 		    --createrepo-webroot PATH
-		      Specify the webroot directory to install the repo (default: /var/www/jriver)
+		      Specify the webroot directory to install the repo (default: /var/www/jriver).
 		    --createrepo-user USER
-		      Specify the web server user if it differs from \$USER
+		      Specify the web server user if it differs from \$USER.
 		  --no-update
-		    Disable automatic installJRMC self-update
+		    Disable automatic installJRMC self-update.
 		  --uninstall, -u
-		    Uninstall JRiver MC, remove services, containers, and firewall rules (does not remove library files)
+		    Uninstall JRiver MC, remove services, containers, and firewall rules (does not remove library files).
 		  --yes, -y, --auto
-		    Assume yes response to questions
+		    Assume yes response to questions.
 		  --version, -v
-		    Print installJRMC version and exit
+		    Print installJRMC version and exit.
 		  --debug, -d
-		    Print debug output
+		    Print debug output.
 		  --help, -h
-		    Print help dialog and exit
+		    Print help dialog and exit.

 		SERVICES
 		  jriver-mediaserver (default --service-type=user)
-		    Enable and start a mediaserver systemd service (requires an existing X server)
+		    Enable and start a mediaserver systemd service (requires an existing X server).
 		  jriver-mediacenter (user)
-		    Enable and start a mediacenter systemd service (requires an existing X server)
+		    Enable and start a mediacenter systemd service (requires an existing X server).
 		  jriver-x11vnc (user)
-		    Enable and start x11vnc for the local desktop (requires an existing X server)
-		    Usually combined with jriver-mediaserver or jriver-mediacenter services
-		    --vncpass and --display are optional (see below)
+		    Enable and start x11vnc for the local desktop (requires an existing X server).
+		    Usually combined with jriver-mediaserver or jriver-mediacenter services.
+		    --vncpass and --display are optional (see below).
 		  jriver-xvnc (system)
-		    Enable and start a new Xvnc session running JRiver Media Center
+		    Enable and start a new Xvnc session running JRiver Media Center.
 		    --vncpass PASSWORD
 		      Set the vnc password for x11vnc/Xvnc access. If no password is set, installJRMC
-		      will either use existing password stored in \$HOME/.vnc/jrmc_passwd or else no password
+		      will either use existing password stored in \$HOME/.vnc/jrmc_passwd or else no password.
 		    --display DISPLAY
 		      Display to use for x11vnc/Xvnc (default: The current display (x11vnc) or the
-		      current display incremented by 1 (Xvnc))
+		      current display incremented by 1 (Xvnc)).
 		  jriver-createrepo (system)
-		    Install hourly service to build latest MC RPM and run createrepo
+		    Install hourly service to build latest MC RPM and run createrepo.
 	EOF
 }

@@ -121,7 +121,7 @@ parse_input() {
  declare -gi BUILD_SWITCH REPO_INSTALL_SWITCH LOCAL_INSTALL_SWITCH \
    CONTAINER_INSTALL_SWITCH CREATEREPO_SWITCH SNAP_INSTALL_SWITCH \
    APPIMAGE_INSTALL_SWITCH COMPAT_SWITCH UNINSTALL_SWITCH YES_SWITCH DEBUG=0
-  declare -g USER_MC_VERSION USER_MC_MVERSION USER_MC_RELEASE USER_MC_REPO USER_ARCH MJR_FILE \
+  declare -g MC_VERSION_USER MC_MVERSION_USER MC_RELEASE_USER MC_REPO_USER USER_ARCH MJR_FILE \
    BETAPASS SERVICE_TYPE VNCPASS USER_DISPLAY BUILD_TARGET CREATEREPO_TARGET
  local long_opts short_opts input
  long_opts="install:,build::,outputdir:,mcversion:,arch:,mcrepo:,compat,"
@@ -151,29 +151,29 @@ parse_input() {
        --mcversion) shift;
          if [[ $1 =~ ^([0-9]+)(\.[0-9]+\.[0-9]+)?(-([0-9]+))?$ ]]; then
            # Major version is required
-            USER_MC_MVERSION="${BASH_REMATCH[1]}"
+            MC_MVERSION_USER="${BASH_REMATCH[1]}"
            # Set default release to 1 if not provided
-            USER_MC_RELEASE="${BASH_REMATCH[4]:-1}"
+            MC_RELEASE_USER="${BASH_REMATCH[4]:-1}"
            # If we get the full version, use it
-            [[ -n ${BASH_REMATCH[2]} ]] && USER_MC_VERSION="${BASH_REMATCH[1]}${BASH_REMATCH[2]}"
+            [[ -n ${BASH_REMATCH[2]} ]] && MC_VERSION_USER="${BASH_REMATCH[1]}${BASH_REMATCH[2]}"

            # Set major version defaults
-            case "$USER_MC_MVERSION" in
-              34) MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}" MC_REPO="bookworm" BOARD_ID="89.0" ;;
-              33) MC_VERSION="${USER_MC_VERSION:-33.0.72}" MC_REPO="bullseye" BOARD_ID="86.0" ;;
-              32) MC_VERSION="${USER_MC_VERSION:-32.0.58}" MC_REPO="bullseye" BOARD_ID="83.0" ;;
-              31) MC_VERSION="${USER_MC_VERSION:-31.0.83}" MC_REPO="bullseye" BOARD_ID="80.0" ;;
-              30) MC_VERSION="${USER_MC_VERSION:-30.0.96}" MC_REPO="buster" BOARD_ID="76.0" ;;
-              29) MC_VERSION="${USER_MC_VERSION:-29.0.91}" MC_REPO="buster" BOARD_ID="74.0" ;;
-              28) MC_VERSION="${USER_MC_VERSION:-28.0.110}" MC_REPO="buster" BOARD_ID="71.0" ;;
-              27) MC_VERSION="${USER_MC_VERSION:-27.0.88}"  MC_REPO="buster" BOARD_ID="67.0" ;;
-              26) MC_VERSION="${USER_MC_VERSION:-26.0.107}" MC_REPO="jessie" BOARD_ID="64.0" ;;
-              25) MC_VERSION="${USER_MC_VERSION:-25.0.114}" MC_REPO="jessie" BOARD_ID="62.0" ;;
-              24) MC_VERSION="${USER_MC_VERSION:-24.0.78}" MC_REPO="jessie" BOARD_ID="58.0" ;;
-              23) MC_VERSION="${USER_MC_VERSION:-23.0.104}" MC_REPO="jessie" BOARD_ID="54.0" ;;
-              22) MC_VERSION="${USER_MC_VERSION:-22.0.102}" MC_REPO="jessie" BOARD_ID="51.0" ;;
-              21) MC_VERSION="${USER_MC_VERSION:-21.0.90}" MC_REPO="jessie" BOARD_ID="44.0" ;;
-              20) MC_VERSION="${USER_MC_VERSION:-20.0.131}" MC_REPO="jessie" BOARD_ID="35.0";;
+            case "$MC_MVERSION_USER" in
+              34) MC_REPO_HARDCODE="bookworm" BOARD_ID="89.0" ;; # fallback to hardcoded version if full version not provided
+              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" ;;
+              30) MC_VERSION_USER="${MC_VERSION_USER:-30.0.96}" MC_REPO_HARDCODE="buster" BOARD_ID="76.0" ;;
+              29) MC_VERSION_USER="${MC_VERSION_USER:-29.0.91}" MC_REPO_HARDCODE="buster" BOARD_ID="74.0" ;;
+              28) MC_VERSION_USER="${MC_VERSION_USER:-28.0.110}" MC_REPO_HARDCODE="buster" BOARD_ID="71.0" ;;
+              27) MC_VERSION_USER="${MC_VERSION_USER:-27.0.88}"  MC_REPO_HARDCODE="buster" BOARD_ID="67.0" ;;
+              26) MC_VERSION_USER="${MC_VERSION_USER:-26.0.107}" MC_REPO_HARDCODE="jessie" BOARD_ID="64.0" ;;
+              25) MC_VERSION_USER="${MC_VERSION_USER:-25.0.114}" MC_REPO_HARDCODE="jessie" BOARD_ID="62.0" ;;
+              24) MC_VERSION_USER="${MC_VERSION_USER:-24.0.78}" MC_REPO_HARDCODE="jessie" BOARD_ID="58.0" ;;
+              23) MC_VERSION_USER="${MC_VERSION_USER:-23.0.104}" MC_REPO_HARDCODE="jessie" BOARD_ID="54.0" ;;
+              22) MC_VERSION_USER="${MC_VERSION_USER:-22.0.102}" MC_REPO_HARDCODE="jessie" BOARD_ID="51.0" ;;
+              21) MC_VERSION_USER="${MC_VERSION_USER:-21.0.90}" MC_REPO_HARDCODE="jessie" BOARD_ID="44.0" ;;
+              20) MC_VERSION_USER="${MC_VERSION_USER:-20.0.131}" MC_REPO_HARDCODE="jessie" BOARD_ID="35.0";;
              *) err "Bad --mcversion"; print_help; exit 1 ;;
            esac
          else
@@ -181,7 +181,7 @@ parse_input() {
          fi
          ;;
        --arch) shift; USER_ARCH="$1" ;;
-        --mcrepo) shift; USER_MC_REPO="$1" ;;
+        --mcrepo) shift; MC_REPO_USER="$1" ;;
        --restorefile) shift; MJR_FILE="$1"; [[ -f $MJR_FILE ]] || err "Specified license $MJR_FILE missing." ;;
        --betapass) shift; BETAPASS="$1" ;;
        --service-type) shift; SERVICE_TYPE="$1" ;;
@@ -208,7 +208,7 @@ parse_input() {
    err "Incorrect option provided, see installJRMC --help"; exit 1
  fi

-  # Set some default conditions
+  # Default to --install=repo (can be overridden later by OS defaults)
  if ! ((UNINSTALL_SWITCH || BUILD_SWITCH || CREATEREPO_SWITCH || LOCAL_INSTALL_SWITCH
  || CONTAINER_INSTALL_SWITCH || SNAP_INSTALL_SWITCH || APPIMAGE_INSTALL_SWITCH)) &&
  [[ ${#SERVICES[@]} -eq 0 && ${#CONTAINERS[@]} -eq 0 ]]; then
@@ -216,7 +216,7 @@ parse_input() {
    REPO_INSTALL_SWITCH=1
  fi

-  if [[ -n $BETA_PASS ]] && ((REPO_INSTALL_SWITCH)); then
+  if [[ -n $BETAPASS ]] && ((REPO_INSTALL_SWITCH)); then
    echo "Warning: not all repositories have beta channels"
    echo "If the MC package is unavailable, try using --mcrepo to select another repository"
  fi
@@ -252,9 +252,10 @@ init() {
  # Run the self-updater if enabled
  ((SELF_UPDATE_SWITCH)) && update "$@"

-  fix_permissions "$HOME/.jriver" "$USER"
+  # Check that the .jriver directory is owned by the user
+  ((YES_SWITCH)) || fix_permissions "$HOME/.jriver" "$USER"

-  # Get host information
+  # Get host information and immediately fail if required vars are unavailable
  [[ -f /etc/os-release ]] && source /etc/os-release

  # Detect host architecture and translate to MC convention
@@ -281,7 +282,7 @@ init() {
    esac
  fi

-  # Normalize ID and set host-specific vars
+  # Normalize ID and set OS defaults
  case $ID in
    debian|fedora|centos) ;;
    rhel|almalinux) ID="centos" ;;
@@ -308,7 +309,7 @@ init() {
        BUILD_SWITCH=1
        LOCAL_INSTALL_SWITCH=1
      fi ;;
-    *) err "Auto-detecting distro, this is unreliable and --compat may be required"
+    *) err "Auto-detecting OS, this is unreliable and --compat may be required."
      for cmd in dnf yum apt-get pacman; do
        if command -v "$cmd" &>/dev/null; then
          case "$cmd" in
@@ -324,7 +325,7 @@ init() {
      if [[ -z $ID ]]; then
        err "OS detection failed!"
        if ask_ok "Continue with manual installation?"; then
-          debug "Automatically using --install=local for unknown distro"
+          debug "Automatically using --install=local for unknown distro."
          ID="unknown"
          REPO_INSTALL_SWITCH=0
          BUILD_SWITCH=1
@@ -335,7 +336,7 @@ init() {
      fi ;;
  esac

-  # Set distro-specific package manager commands for normalized IDs
+  # Set distro-specific package manager commands for normalized OS
  case $ID in
    fedora|centos|mandriva)
      local rpm_mgr
@@ -380,30 +381,30 @@ init() {
  BUILD_TARGET="${BUILD_TARGET:-$ID}"
  CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}"

-  # Repo selection
-  # Match repo to the host on MC31+ unless overriden by user
-  if [[ $ID =~ debian|ubuntu && "${USER_MC_MVERSION:-${MC_VERSION%%.*}}" -ge 31 ]]; then
-    MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO}}
+  # Repo selection (precedence: user > host (MC31+ debian/ubuntu) > hardcoded)
+  if [[ -n $MC_REPO_USER ]]; then
+    MC_REPO="$MC_REPO_USER"
+  elif [[ $ID =~ debian|ubuntu && "${MC_MVERSION_USER:-${MC_VERSION_HARDCODE%%.*}}" -ge 31 ]]; then
+    MC_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO_HARDCODE}}
+  else
+    MC_REPO="$MC_REPO_HARDCODE"
  fi
-  MC_REPO="${USER_MC_REPO:-$MC_REPO}" # allow user override

  echo "MC source -> target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH"

-  # Retrieves the latest MC version number if we need it
-  if ((BUILD_SWITCH || LOCAL_INSTALL_SWITCH || CREATEREPO_SWITCH)); then
-    get_latest_mc_version
-  fi
+  set_mc_version
+
+  echo "Selected MC version $MC_VERSION from the $MC_REPO repo (via $MC_VERSION_SOURCE)"
  
-  # Set MC version variables
-  MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}"
-  MC_RELEASE="${USER_MC_RELEASE:-1}"
-  MC_MVERSION="${USER_MC_MVERSION:-${MC_VERSION%%.*}}"
+  # Set additional MC version variables
+  MC_RELEASE="${MC_RELEASE_USER:-1}"
+  MC_MVERSION="${MC_MVERSION_USER:-${MC_VERSION%%.*}}"
  MC_PKG="mediacenter$MC_MVERSION"
  MC_RPM="$OUTPUT_DIR/RPMS/$ARCH/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE.$ARCH.rpm"
  MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION"

  # Generate explicit package name
-  if [[ -n $USER_MC_VERSION ]]; then
+  if [[ -n $MC_VERSION_USER ]]; then
    # Append explicit package version when user provides --mcversion
    case $ID in
      fedora|centos|suse|mandriva) MC_PKG+="-$MC_VERSION" ;;
@@ -413,30 +414,39 @@ init() {
 }

 # @description Determines the latest JRiver MC version using several methods
-get_latest_mc_version() {
+set_mc_version() {
  debug "${FUNCNAME[0]}()"
-  local mc_version_source
+  declare -g MC_VERSION MC_VERSION_SOURCE

-  # User --mcversion
-  if [[ -n $USER_MC_VERSION ]]; then
-    mc_version_source="user input"
+  if [[ -n $MC_VERSION_USER ]]; then
+    MC_VERSION="$MC_VERSION_USER"
+    MC_VERSION_SOURCE="user input"
+    return 0  
+  fi
+
+  # Package manager will handle updates in other instances
+  if ! ((BUILD_SWITCH || LOCAL_INSTALL_SWITCH || CREATEREPO_SWITCH)); then
+    MC_VERSION="$MC_VERSION_HARDCODE"
+    MC_VERSION_SOURCE="hardcoded"
+    return 0
+  fi
+
+  # Determine latest version
  # Containerized package manager
-  elif create_mc_apt_container &&
-  MC_VERSION=$(sudo buildah run "$CNT" -- apt-cache policy "mediacenter${USER_MC_MVERSION:-${MC_VERSION%%.*}}" | awk '/Candidate:/ {sub(/-.*/, "", $2); print $2}' | sort -V | tail -n1) &&
+  if create_mc_apt_container &&
+  MC_VERSION=$(sudo buildah run "$CNT" -- apt-cache policy "mediacenter${MC_MVERSION_USER:-${MC_VERSION_HARDCODE%%.*}}" | awk '/Candidate:/ {sub(/-.*/, "", $2); print $2}' | sort -V | tail -n1) &&
  execute sudo buildah rm "$CNT" &&
  [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    mc_version_source="containerized package manager"
+    MC_VERSION_SOURCE="containerized package manager"
  # Fallback to webscrape
  elif MC_VERSION=$(download "https://yabb.jriver.com/interact/index.php/board,$BOARD_ID.html" "-" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' | head -n 1) &&
  [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    mc_version_source="webscrape"
+    MC_VERSION_SOURCE="webscrape"
  # Fallback to hardcoded value
  else
-    mc_version_source="hardcoded"
-    echo "Warning! Using hardcoded version number"
+    MC_VERSION="$MC_VERSION_HARDCODE"
+    MC_VERSION_SOURCE="hardcoded"
  fi
-    
-  echo "Selected MC version $MC_VERSION from the $MC_REPO repo (via $mc_version_source)"
 }

 # @description Installs a package using the system package manager
@@ -470,7 +480,7 @@ install_package() {
    shift
  done

-  # Define distribution-specific package aliases
+  # Distribution-specific package aliases
  case $ID in
    debian|ubuntu) pkg_aliases=(
      [rpm-build]="rpm"
@@ -503,7 +513,7 @@ install_package() {
    done
  done

-  # Generate installation flags based on the distribution
+  # Add OS install flags to package manager command
  case $ID in
    debian|ubuntu)
      ((allow_downgrades)) && install_flags+=(--allow-downgrades)
@@ -777,8 +787,8 @@ acquire_deb() {
 translate_packages() {
  debug "${FUNCNAME[0]}()" "$*"
  local deb_file="$1"
-  declare -n requires_arr="$2"
-  declare -n recommends_arr="$3"
+  # shellcheck disable=SC2178
+  declare -n requires_arr="$2" recommends_arr="$3"
  local -i i

  # Load deb dependencies into array
@@ -920,11 +930,11 @@ translate_packages() {
  esac
 }

-# @description Creates a SPEC file and builds the RPM from the source DEB using rpmbuild
+# @description Creates an RPM .spec file and builds the RPM from the source DEB using rpmbuild
 build_rpm() {
  debug "${FUNCNAME[0]}()"
-  declare -n requires_arr="$1"
-  declare -n recommends_arr="$2"
+  # shellcheck disable=SC2178
+  declare -n requires_arr="$1" recommends_arr="$2"
  local requires_str recommends_str 
  local i rpmbuild_cmd stub
  local spec_file="$OUTPUT_DIR/SPECS/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE-$BUILD_TARGET-$ARCH.spec"
@@ -949,6 +959,9 @@ build_rpm() {
  # Convert array to newline delim'd string (for heredoc)
  printf -v requires_str "Requires: %s\n" "${requires_arr[@]}"
  printf -v recommends_str "Recommends: %s\n" "${recommends_arr[@]}"
+
+  unset requires_arr recommends_arr
+
  # Strip last newline
  requires_str="${requires_str%?}" 
  recommends_str="${recommends_str%?}"
@@ -1021,8 +1034,8 @@ build_rpm() {
 # @description Creates the Arch PKGBUILD file for Media Center
 build_pkgbuild() {
  debug "${FUNCNAME[0]}()"
-  declare -n requires_arr="$1"
-  declare -n recommends_arr="$2"
+  # shellcheck disable=SC2178
+  declare -n requires_arr="$1" recommends_arr="$2"
  local pkgbuild_file="$OUTPUT_DIR/PKGBUILD/mediacenter.pkgbuild"

  [[ -d $OUTPUT_DIR/PKGBUILD ]] || execute mkdir -p "$OUTPUT_DIR/PKGBUILD"
@@ -1045,6 +1058,7 @@ build_pkgbuild() {
 			bsdtar xf data.tar.xz -C "\$pkgdir"
 		}
 	EOF
+  unset requires_arr recommends_arr
 }

 # @description Installs Media Center via DEB package w/ optional compatability fixes
@@ -1725,7 +1739,7 @@ uninstall() {
      echo "To restore your MC library: mv $HOME/.jriver.bk $HOME/.jriver"
      return
    fi
-    echo "To reset and backup your MC library: mv $HOME/.jriver $HOME/.jriver.bk"
+    echo "To backup and reset your MC library: mv $HOME/.jriver $HOME/.jriver.bk"
    echo "To remove your MC library: rm -rf $HOME/.jriver"
  fi
 }
@@ -1857,7 +1871,7 @@ main() {
  if ((BUILD_SWITCH)); then
    acquire_deb || { err "Could not download Media Center DEB package"; return 1; }

-    # Convert the source DEB dependencies to various distro-specific package naming
+    # Convert the source DEB dependencies to various distro-specific packages
    install_package dpkg
    translate_packages "$MC_DEB" requires recommends

@@ -1924,6 +1938,7 @@ main() {
 }

 # @section Helper functions
+# @internal
 debug() { ((DEBUG)) && echo "Debug: $*"; }
 err() { echo "Error: $*" >&2; }
 ask_ok() {
@@ -2005,7 +2020,7 @@ add_temp_repo() {
  if [[ "$ID" == "ubuntu" ]]; then
    local major_version="${VERSION_ID%%.*}"
    local minor_version="${VERSION_ID##*.}"
-    minor_version="${minor_version#0}"  # strip leading zero
+    minor_version="${minor_version#0}" # strip leading zero
    if [[ $major_version -gt 24 || ( $major_version -eq 24 && minor_version -ge 4 ) ]]; then
      echo "Temporarily adding jammy repository for libwebkit2gtk-4.0-37, etc."
      repo_name="ubuntu-jammy-temp"
Author	SHA1	Message	Date
bryan	98a10f2539	1.34.9 release	2025-10-21 17:56:29 -04:00
bryan	373ec80694	Don't unset recommends namerefs	2025-10-21 17:55:01 -04:00
bryan	f7ddf6830e	Remove buildah force flag	2025-10-21 17:49:08 -04:00
bryan	29ade7e11c	Set MC_VERSION in all cases	2025-10-21 17:23:43 -04:00
bryan	c9ac0c94b0	Streamline user version handling	2025-10-21 17:04:12 -04:00
bryan	eda302ac11	Update default version	2025-10-21 15:06:03 -04:00
bryan	a975749b26	Remove explicit version check	2025-10-21 15:04:55 -04:00
bryan	da199b1278	Silence erroneous shellcheck warnings and update docs	2025-08-06 21:29:18 -04:00
bryan	c6429d563c	Fix linting	2025-08-02 20:05:17 -04:00