Browse Source

Fix merge conflicts

bryan 2 years ago
parent
commit
dbe14d4935
4 changed files with 34 additions and 58 deletions
  1. 2 1
      .gitignore
  2. 0 21
      Containerfile
  3. 31 34
      README.md
  4. 1 2
      installJRMC

+ 2 - 1
.gitignore

@@ -5,4 +5,5 @@ testing.sh
 tests
 mwe*
 test*
-container*
+container*
+Containerfile

+ 0 - 21
Containerfile

@@ -1,21 +0,0 @@
-FROM fedora:latest
-LABEL maintainer="bryanroessler@gmail.com"
-
-RUN dnf install dpkg rpm-build createrepo httpd -y
-
-RUN curl -sO "https://git.bryanroessler.com/bryan/install_MC_fedora/raw/master/install_MC_fedora.sh" \
-    && chmod +x ./install_MC_fedora.sh \
-    && ./install_MC_fedora.sh -b
-
-RUN dnf clean all
-
-COPY root/ /
-
-RUN systemctl enable httpd build-jriver-repo.timer
-
-EXPOSE 80
-
-CMD [ "/usr/sbin/init" ]
-
-# podman build -t build-jriver-repo .
-# podman run -d -p 8081:80 localhost/build-jriver-repo

+ 31 - 34
README.md

@@ -1,46 +1,42 @@
 # installJRMC
 
-This program will install [JRiver Media Center](https://www.jriver.com/) and associated helper services on Fedora (>=29), CentOS (>=8), Ubuntu (>=16.04), and Debian (>=9).
+This program will install [JRiver Media Center](https://www.jriver.com/) and associated helper services on Fedora, CentOS (>=8), Ubuntu, Debian, and Linux Mint.
 
 ## README
 
-1.  This script will not point major upgrades (i.e. from v25 to v26) to your old library. You should **first perform a library backup**, install the new major version, and then restore the library backup in the new version.
-2.  Typically `installJRMC` should be **executed as your normal user** (i.e. don't run it with `sudo`). Services are installed for the user that executes the script so do not execute as root unless you want to install system-wide services. Doing so may lead to permissions issues. `installJRMC` will prompt you for your `sudo` password as necessary to install dependencies and services.
+1. This script will not point major upgrades to your old library. You should **first perform a library backup**, install the new major version, and then restore the library backup in the new version.
+2. Typically `installJRMC` should be **executed as your normal user** (i.e. don't run it with `sudo`). Services are installed for the user that executes the script so do not execute as root unless you want to install system-wide services. Doing so may lead to permissions issues. `installJRMC` will prompt you for your `sudo` password as necessary to install dependencies and services.
 
 ## Executing
 
 `installJRMC [--option [ARGUMENT]]`
 
-Running `installJRMC` without any options will install the latest version of JRiver Media Center from the official JRiver repository (Ubuntu/Debian) or my [unofficial repository](https://repos.bryanroessler.com/jriver/) (Fedora/CentOS) using the system package manager. If any other option is specified then the default install method will need to be specified using `--install-repo` (or `--install-rpm`). This makes it possible to install services, containers, repos, etc. independent from Media Center.
+Running `installJRMC` without any options will install the latest version of JRiver Media Center from the official JRiver repository (Ubuntu/Debian) or my [unofficial repository](https://repos.bryanroessler.com/jriver/) (Fedora/CentOS) using the system package manager. If any other option is specified, then the default install method will need to be specified using `--install`. This makes it possible to install services, containers, repos, etc. independent of Media Center.
 
 ## Options
 
 Here is a list of possible options that can be passed to the script. You can always find the latest supported options by running `installJRMC --help`.
 
 ```text
---install-repo
-    Install JRiver Media Center from repository using package manager (Default)
-    DEB-based OSes: Official package repository
-    RPM-based OSes: BryanC's unofficial repository
---install-rpm
-     (RPM-based OSes only) Build RPM from source DEB and install it
---rpmbuild
-    Build RPM from source DEB
---outputdir PATH
-    Generate rpmbuild output in this directory (Default: $PWD/outputdir)
+--install, -i repo|rpm
+    repo: Install MC from repository, future updates will be handled by the system package manager
+    rpm: Build and install MC locally (RPM-based OSes only)
+--build
+    Build RPM from source DEB (no installation)
 --mcversion VERSION
-    Build or install a specific version (Default: install the latest version)
+    Build or install a specific MC version, ex. "28.0.25"
+--outputdir PATH
+    Generate rpmbuild output in this directory (Default: $PWD/output)
 --restorefile RESTOREFILE
-    Restore file location for registration (Default: skip registration)
+    Restore file location for automatic license registration (Default: skip registration)
 --betapass PASSWORD
     Enter beta team password for access to beta builds
 --service-user USER
-    Install systemd services and containers for USER
+    Install systemd services and containers for USER (Default: current user)
 --service, -s SERVICE
     See SERVICES section below for a list of possible services to install
---container, -c CONTAINER
+--container, -c CONTAINER (TODO: Under construction)
     See CONTAINERS section below for a list of possible services to install
-    TODO: Containers are a work-in-progress
 --createrepo
     Build rpm, copy to webroot, and run createrepo
 --createrepo-webroot PATH
@@ -57,10 +53,9 @@ Here is a list of possible options that can be passed to the script. You can alw
     Uninstall JRiver MC, cleanup service files, and remove firewall rules (does not remove library files)
 ```
 
-
 ### services
-When installing systemd services it is important to execute `installJRMC` as the user you wish to run the services. Typically this is your normal user account but for some server installations it may be necessary to execute the script as root. If so, use `--service-user root` to override sanity checks.
 
+When installing systemd services it is important to execute `installJRMC` as the user you wish to run the services. Typically this is your normal user account but for some server installations it may be necessary to execute the script as root. If so, use `--service-user root` to override sanity checks.
 
 ```text
 jriver-mediaserver
@@ -70,7 +65,7 @@ jriver-mediacenter
 jriver-x11vnc
     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-mediacenter
+jriver-xvnc
     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
@@ -82,12 +77,13 @@ jriver-createrepo
     Install hourly service to build latest MC RPM and run createrepo
 ```
 
-It is possible to install multiple services at one time using multiple `--service` blocks: `installJRMC --install-repo --service jriver-x11vnc --service jriver-mediacenter`
+It is possible to install multiple services at one time using multiple `--service` blocks: `installJRMC --repo --service jriver-x11vnc --service jriver-mediacenter`
+
+#### `jriver-x11vnc` versus `jriver-xvnc`
 
-##### `jriver-x11vnc` versus `jriver-xvnc-mediacenter`
-[jriver-x11vnc](http://www.karlrunge.com/x11vnc/) shares your existing X display via VNC and can be combined with additional services to start Media Center or Media Server. Conversely, [jriver-xvnc-mediacenter](https://tigervnc.org/doc/Xvnc.html) creates a new Xvnc display and starts a JRiver Media Center service in the foreground of the new VNC display. The requisite firewall rules will also be added to the system firewall to enable remote access.
+[jriver-x11vnc](http://www.karlrunge.com/x11vnc/) shares your existing X display via VNC and can be combined with additional services to start Media Center or Media Server. Conversely, [jriver-xvnc](https://tigervnc.org/doc/Xvnc.html) creates a new Xvnc display and starts a JRiver Media Center service in the foreground of the new VNC display. The requisite firewall rules will also be added to the system firewall to enable remote access.
 
-**Note**: If `jriver-xvnc-mediacenter` finds an existing display it will attempt to increment the display number by 1. This should work fine in most cases, but if you have multiple running X servers on your host machine you should use the `--display` option to specify a free display.
+**Note**: If `jriver-xvnc` finds an existing display it will attempt to increment the display number by 1. This should work fine in most cases, but if you have multiple running X servers on your host machine you should use the `--display` option to specify a free display.
 
 ### Firewall Rules
 
@@ -101,39 +97,40 @@ It is possible to install multiple services at one time using multiple `--servic
 
 ## Examples
 
-*   `installJRMC`
+* `installJRMC`
 
     Installs the latest version of JRiver Media Center from the repository.
 
-*   `installJRMC --install-repo --service jriver-mediaserver`
+* `installJRMC --install repo --service jriver-mediaserver`
 
     Installs JRiver Media Center from the repository and starts/enables the /MediaServer service.
 
-*   `installJRMC --install-rpm --restorefile /path/to/license.mjr --mcversion 26.0.56`
+* `installJRMC --install rpm --restorefile /path/to/license.mjr --mcversion 26.0.56`
 
     Builds JRiver Media Center version 26.0.56 RPM from the source DEB, installs it (RPM distros only), and activates it using the specified .mjr license file.
 
-*   `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`
+* `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`
 
      Builds the RPM, moves it to the webroot, and runs createrepo as `www-user`.
 
-*   `installJRMC --service jriver-createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`
+* `installJRMC --service jriver-createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`
 
     Installs the jriver-createrepo timer and service to build the RPM, move it to the webroot, and run createrepo as `www-user` hourly.
 
-*   `installJRMC --install-repo --service jriver-x11vnc --service jriver-mediacenter --vncpass "letmein"`
+* `installJRMC --install repo --service jriver-x11vnc --service jriver-mediacenter --vncpass "letmein"`
 
     Installs services to share the existing local desktop via VNC and automatically run Media Center on startup.
 
-*   `installJRMC --install-repo --service jriver-xvnc-mediacenter --display ":2"`
+* `installJRMC --install repo --service jriver-xvnc --display ":2"`
 
     Installs an Xvnc server on display ':2' that starts Media Center.
 
-*   `installJRMC --uninstall`
+* `installJRMC --uninstall`
 
     Uninstalls JRiver Media Center and its associated services and firewall rules. This will **not** remove your media, media library/database, or automated library backup folder.
 
 ## Additional Info
+
 Did you find `installJRMC` useful? [Buy me a coffee!](https://paypal.me/bryanroessler?locale.x=en_US)
 
 Did you find a bug? Let me know on [Interact!](https://yabb.jriver.com/interact/index.php/topic,123648.0.html)

+ 1 - 2
installJRMC

@@ -1171,7 +1171,6 @@ service_jriver-createrepo() {
 #     brc del-pkg .build-deps
 # }
 
-
 uninstall() {
     debug "Running: ${FUNCNAME[0]}"
 
@@ -1331,4 +1330,4 @@ main() {
 }
 
 
-main "$@"
+main "$@"