From fd3f82f88a6cbf44d4d4f6466d06e77b24fb64e6 Mon Sep 17 00:00:00 2001 From: bryan Date: Sun, 13 Aug 2023 13:07:42 -0400 Subject: [PATCH] Update version refs --- .gitignore | 3 +- README.md | 6 +-- forum.bbcode | 126 --------------------------------------------------- installJRMC | 10 ++-- 4 files changed, 10 insertions(+), 135 deletions(-) delete mode 100644 forum.bbcode diff --git a/.gitignore b/.gitignore index c8c3776..59b799c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ tests mwe* test* container* -Containerfile \ No newline at end of file +Containerfile +forum.bbcode \ No newline at end of file diff --git a/README.md b/README.md index bb4632c..0251ab6 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ $ installJRMC --help --compat Build/install MC without minimum dependency version requirements --mcversion VERSION - Build or install a specific MC version, ex. "31.0.23" (default: latest version) + Build or install a specific MC version, ex. "31.0.43" (default: latest version) --arch ARCH Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture) --outputdir PATH @@ -112,9 +112,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 31.0.23` +* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 31.0.43` - Build and install an MC 31.0.23 comptability RPM locally and activate it using the `/path/to/license.mjr` + Build and install an MC 31.0.43 comptability 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/forum.bbcode b/forum.bbcode deleted file mode 100644 index dc470c7..0000000 --- a/forum.bbcode +++ /dev/null @@ -1,126 +0,0 @@ -[size=20pt]installJRMC[/size] - -This program will install [url=https://www.jriver.com/]JRiver Media Center[/url] and associated services on most major Linux distros. - -You can always find the latest version of installJRMC, changelog, and documentation in [url=https://git.bryanroessler.com/bryan/installJRMC]my repository[/url]. - -[size=18pt]Instructions[/size] - -Download and unzip installJRMC from the attachment below or grab the latest stable version directly from my repo and execute it: - -[code]curl -O https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC && -chmod +x ./installJRMC && -./installJRMC [--option [ARGUMENT]][/code] - -Running `installJRMC` without any options will install the latest version of JRiver Media Center from the official JRiver repository (Ubuntu/Debian) or my [url=https://repos.bryanroessler.com/jriver/]unofficial repository[/url] (Fedora/CentOS) using the system package manager ([i]i.e.[/i] --install repo). If any other option is passed, then the install method (--install repo or --install local) must be specified, to make it possible to install services and containers independent of MC. - -[size=18pt]Options[/size] - -[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 ---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 '=') ---compat - Build/install MC without minimum dependency version requirements ---mcversion VERSION - Build or install a specific MC version, ex. "31.0.23" ---arch ARCH - Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture) ---outputdir PATH - Generate rpmbuild output in this PATH (default: ./output) ---restorefile RESTOREFILE - Restore file location for automatic license registration ---betapass PASSWORD - Enter beta team password for access to beta builds ---service, -s SERVICE - 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) ---container, -c CONTAINER (TODO: Under construction) - 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 '=') - --createrepo-webroot PATH - The webroot directory to install the repo (default: /var/www/jriver/) - --createrepo-user USER - The web server user if different from the current user ---yes, -y, --auto - Always assumes yes for questions ---version, -v - Print this script version and exit ---debug, -d - Print debug output ---help, -h - Print help dialog and exit ---uninstall, -u - Uninstall JRiver MC, service files, and firewall rules (does not remove library or media files) -[/code] - -[size=18pt]Services[/size] - -[code]jriver-mediaserver (user) - 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) -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) -jriver-xvnc (system) - 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 - --display DISPLAY - Manually specify display to use for x11vnc/Xvnc (ex. ':1') -jriver-createrepo (system) - Install hourly service to build latest MC RPM and run createrepo - By default installs as root service to handle www permissions more gracefully -[/code] - -By default, MC services use a sane `--service-type` listed next to the service name in the Services description. User services can be manipulated as an unprivileged user, for example: [i]systemctl --user stop jriver-mediacenter[/i] and begin at user login. System services are manipulable as root, for example: [i]sudo systemctl stop jriver-servicename@username.service[/i] and begin at system boot. Note that it is possible to run all services of a particular user at boot using [url=https://www.freedesktop.org/software/systemd/man/loginctl.html]sudo loginctl enable-linger username[/url]. - -Multiple services (but not --service-types) can be installed at one time using multiple --service blocks: [code]installJRMC --install repo --service jriver-x11vnc --service jriver-mediacenter[/code] - -[size=14pt]jriver-x11vnc versus jriver-xvnc[/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] - -[b]Coming soon![/b] - -[size=18pt]Firewall[/size] - -`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`. -[b]Note:[/b] `ufw` is not installed by default on Debian but will be installed by `installJRMC`. To prevent SSH lock-out, Debian users that have not already enabled `ufw` will need to `sudo ufw enable` after running `installJRMC` and inspecting their configuration. - -[size=18pt]Examples[/size] - -[code]installJRMC[/code] -Install the latest version of MC from the best available repository. -[code]installJRMC --install local --compat[/code] -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 31.0.23[/code] -Build and install an MC 31.0.23 comptability RPM locally and activate it using the /path/to/license.mjr -[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] -Install the jriver-createrepo timer and service to build the RPM, move it to the webroot, and run createrepo as www-user hourly. -[code]installJRMC --install repo --service jriver-x11vnc --service jriver-mediacenter --vncpass "letmein"[/code] -Install services to share the existing local desktop via VNC and automatically run MC on startup. -[code]installJRMC --install repo --service jriver-xvnc --display ":2"[/code] -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 backup folder. - -[size=18pt]Additional Info[/size] - -Did you find installJRMC useful? [url=https://paypal.me/bryanroessler?locale.x=en_US]Buy me a coffee![/url] - -Did you find a bug? Let me know on [url=https://yabb.jriver.com/interact/index.php/topic,134152.0.html]Interact![/url] \ No newline at end of file diff --git a/installJRMC b/installJRMC index ed13f8c..d611f77 100755 --- a/installJRMC +++ b/installJRMC @@ -19,12 +19,12 @@ shopt -s extglob declare -g SCRIPTVERSION="1.0-dev" declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,80.0.html" # MC31 declare -g DEBIANBASE="bullseye" -declare -g MC_VERSION_HARDCODE="31.0.23" # Do find all replace +declare -g MC_VERSION_HARDCODE="31.0.43" # Do find all replace printHelp() { debug "Running: ${FUNCNAME[0]}" - cat <<-'EOF' + cat <<-EOF USAGE: installJRMC [[OPTION] [VALUE]]... @@ -40,7 +40,7 @@ printHelp() { --compat Build/install MC locally without minimum dependency version requirements --mcversion VERSION - Specify the MC version, ex. "31.0.23" (default: latest version) + Specify the MC version, ex. "$MC_VERSION_HARDCODE" (default: latest version) --arch VERSION Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture) --outputdir PATH @@ -62,7 +62,7 @@ printHelp() { --createrepo-webroot PATH 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 --uninstall, -u Uninstall JRiver MC, remove services, containers, and firewall rules (does not remove library files) --yes, -y, --auto @@ -87,7 +87,7 @@ printHelp() { 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 use no password + will either use existing password stored in \$HOME/.vnc/jrmc_passwd or use no password --display DISPLAY Display to use for x11vnc/Xvnc (default: The current display (x11vnc) or the current display incremented by 1 (Xvnc))