Refactoring

README.md

@@ -11,21 +11,21 @@ This program will install [JRiver Media Center](https://www.jriver.com/) and ass
 
 `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 `--repo` or `--rpm`. 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
+--repo
-    Install JRiver Media Center from repository using package manager (Default)
+    Install JRiver Media Center from repository using package manager
     DEB-based OSes: Official package repository
     RPM-based OSes: BryanC's unofficial repository
---install-rpm
+--rpm
-     (RPM-based OSes only) Build RPM from source DEB and install it
+     Build RPM from source DEB and install it
 --rpmbuild
-    Build RPM from source DEB
+    Build RPM from source DEB but do not install
 --outputdir PATH
     Generate rpmbuild output in this directory (Default: $PWD/outputdir)
 --mcversion VERSION
@@ -81,7 +81,7 @@ 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-mediacenter`
 
@@ -105,11 +105,11 @@ It is possible to install multiple services at one time using multiple `--servic
 
     Installs the latest version of JRiver Media Center from the repository.
 
-* `installJRMC --install-repo --service jriver-mediaserver`
+* `installJRMC --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 --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.
 
@@ -121,11 +121,11 @@ It is possible to install multiple services at one time using multiple `--servic
 
     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 --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 --repo --service jriver-xvnc-mediacenter --display ":2"`
 
     Installs an Xvnc server on display ':2' that starts Media Center.