diff --git a/.README.bbcode b/.README.bbcode index d2814bc..bbccbd1 100644 --- a/.README.bbcode +++ b/.README.bbcode @@ -1,14 +1,11 @@ -[size=20pt]installJRMC[/size] - +[u][size=20pt]installJRMC[/size][/u] 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] +[u][size=18pt]tl;dr (One-line MC install)[/size][/u] [code]curl https://git.bryanroessler.com/bryan/installJRMC/raw/branch/master/installJRMC|bash[/code] -[size=18pt]Instructions[/size] - +[u][size=18pt]Instructions[/size][/u] Download and unzip installJRMC from the attachment below or grab the latest stable version directly: [code]curl -O https://git.bryanroessler.com/bryan/installJRMC/raw/branch/master/installJRMC && chmod +x ./installJRMC && @@ -18,8 +15,7 @@ chmod +x ./installJRMC && [tt]installJRMC[/tt] defaults to [tt]--install=repo[/tt] on distros with MC repositories and [tt]--install=local[/tt] on all others. Specifying [tt]--build[/tt], [tt]--createrepo[/tt], [tt]--service[/tt], or [tt]--uninstall[/tt] disables the default install method. -[size=18pt]Options[/size] - +[u][size=18pt]Options[/size][/u] [code] $ installJRMC --help --install, -i repo|local @@ -31,7 +27,7 @@ $ installJRMC --help --compat Build/install MC locally without minimum dependency version requirements. --mcversion VERSION - Specify the MC version, ex. "35.0.71" or "35" (default: latest release). + Specify the MC version, ex. "35.0.74" or "35" (default: latest release). --arch ARCH Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host). --mcrepo REPO @@ -44,8 +40,8 @@ $ installJRMC --help Enter beta team password for access to beta builds. --service, -s SERVICE See SERVICES below for possible services to install. - --service-type user|system - Starts services at boot (system) or at user login (user) (default: per service, see SERVICES). +--service-type user|system + Starts services at boot (system) or at user login (user) (default: per service, see SERVICES). --no-update Disable automatic installJRMC self-update. --uninstall, -u @@ -80,8 +76,7 @@ ADVANCED OPTIONS GPG key ID, fingerprint, or UID used for --sign. [/code] -[size=18pt]Services[/size] - +[u][size=18pt]Services[/size][/u] [code]jriver-mediaserver (user) Enable and start a mediaserver systemd service (requires an existing X server). jriver-mediacenter (user) @@ -99,28 +94,24 @@ jriver-createrepo (system) 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. +Services use a sane default [tt]--service-type[/tt] listed next to the service name (in parentheses) in SERVICES. User services can be manipulated as an unprivileged user, for example: [tt]systemctl --user stop jriver-mediacenter[/tt] and begin at user login. System services are manipulable as root, for example: [tt]sudo systemctl stop jriver-servicename@username.service[/tt] and begin at system boot. -Note that it is possible to run all services of a particular user at boot using [tt][url=https://www.freedesktop.org/software/systemd/man/loginctl.html]sudo loginctl enable-linger username[/url][/tt]. +It is possible to run all services of a particular user at boot using [tt][url=https://www.freedesktop.org/software/systemd/man/loginctl.html]sudo loginctl enable-linger username[/url][/tt]. Multiple services (but not [tt]--service-types[/tt]) can be installed at one time using multiple [tt]--service[/tt] blocks: [code]installJRMC --install repo --service jriver-x11vnc --service jriver-mediacenter[/code] [size=14pt][tt]jriver-x11vnc[/tt] versus [tt]jriver-xvnc[/tt][/size] - [url=http://www.karlrunge.com/x11vnc/]jriver-x11vnc[/url] shares your existing X display via VNC and can be combined with additional services to start Media Center or Media Server. Conversely, [url=https://tigervnc.org/doc/Xvnc.html]jriver-xvnc[/url] creates a new Xvnc display and starts a JRiver Media Center service in the foreground of the new VNC display. -[size=18pt]Containers[/size] - +[u][size=18pt]Containers[/size][/u] [b]Coming soon![/b] -[size=18pt]Firewall[/size] - +[u][size=18pt]Firewall[/size][/u] 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). -[size=18pt]Other Nicities[/size] -[list] +[u][size=18pt]Other Nicities[/size][/u][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. @@ -128,7 +119,7 @@ installJRMC automatically creates port forwarding firewall rules for remote acce [*]Activates MC if a valid license file is found in common locations. [/list] -[size=18pt]Examples[/size] +[u][size=18pt]Examples[/size][/u] [code]installJRMC[/code] Install the latest version of MC from the best available repository. [code]installJRMC --mcversion 33 --debug[/code] @@ -137,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.71[/code] -Build and install an MC 35.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.74[/code] +Build and install an MC 35.0.74 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] @@ -152,10 +143,7 @@ Install an Xvnc server on display ':2' that starts MC. [code]installJRMC --uninstall[/code] Uninstall MC, services, and firewall rules. This will [b]not[/b] remove your media, media library/database, or library backups. -[size=18pt]Additional Info[/size] - +[u][size=18pt]Additional Info[/size][/u] Did you find installJRMC useful? [url=https://paypal.me/bryanroessler]Paypal me a coffee![/url] - [url=bitcoin:bc1q7wy0kszjavgcrvkxdg7mf3s6rh506rasnhfa4a]↓ ↓ ↓ Bitcoin ↓ ↓ ↓[/url] - [url=bitcoin:bc1q7wy0kszjavgcrvkxdg7mf3s6rh506rasnhfa4a][img]https://repos.bryanroessler.com/files/bc1q7wy0kszjavgcrvkxdg7mf3s6rh506rasnhfa4a.png[/img][/url] \ No newline at end of file diff --git a/README.md b/README.md index 18c3f60..618459a 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.71" or "35" (default: latest release). + Specify the MC version, ex. "35.0.74" 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.71` +* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.74` - Build and install an MC 35.0.71 compatibility RPM locally and activate it using the `/path/to/license.mjr`. + Build and install an MC 35.0.74 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 eb0ea85..237dccb 100755 --- a/installJRMC +++ b/installJRMC @@ -22,8 +22,8 @@ # shellcheck disable=SC2329 shopt -s extglob -declare -g SCRIPT_VERSION="1.35.15" -declare -g MC_VERSION_HARDCODE="35.0.71" # do find all replace +declare -g SCRIPT_VERSION="1.35.16-dev" +declare -g MC_VERSION_HARDCODE="35.0.74" # 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 -gi SELF_UPDATE_SWITCH=1 # 0 to disable installJRMC self-update @@ -896,7 +896,7 @@ translate_packages() { arch) # Set these manually for Arch since they are quite different requires_arr=('alsa-lib' 'ca-certificates' 'dbus' 'gtk3' 'gcc-libs' 'libx11' 'libxext' - 'libxcb' 'libxau' 'libxdmcp' 'libxss' 'util-linux' 'mesa-libgl' 'webkit2gtk') + 'libxcb' 'libxau' 'libxdmcp' 'libxss' 'util-linux' 'mesa-libgl' 'webkit2gtk-4.1') recommends_arr=('mesa-libgl' 'nvidia-libgl' 'nvidia-utils' 'vulkan-intel' 'vulkan-radeon' 'vorbis-tools' 'musepack-tools') ;;