47 Commits

Author SHA1 Message Date
eb085ef529 Refactor to improve messaging 2021-12-02 13:44:18 -05:00
15f408b193 Cleanup buildrpm output 2021-12-02 13:36:37 -05:00
880de70491 Hide an error we can workaround 2021-12-02 13:17:48 -05:00
2fea7aa40e Nest some functions 2021-12-02 13:09:18 -05:00
5f4486d16d disable version checks for createrepo servers 2021-12-02 12:34:07 -05:00
2e4d3684bf Fix service install 2021-12-02 12:27:56 -05:00
c946a5438b Commit before merge 2021-12-02 11:26:34 -05:00
dbd884f445 Make latest version compat smarter 2021-12-02 11:23:13 -05:00
b9bead8d24 Put bionic on stretch 2021-12-02 10:41:27 -05:00
dbe14d4935 Fix merge conflicts 2021-12-02 10:30:58 -05:00
8fa74af815 Grammar 2021-12-02 10:09:26 -05:00
4f7a67322f Fix createrepo check 2021-12-02 10:04:51 -05:00
be8b7e4c9e Add universe repository if missing on Ubuntu 2021-12-02 09:58:47 -05:00
f84c55cee6 Generalize systemd unit dir 2021-12-02 08:57:28 -05:00
5e9b0be628 Housekeeping 2021-12-01 19:39:14 -05:00
50740e9fd5 Fix rpmbuild package issue on the debs 2021-12-01 18:11:45 -05:00
89dac984a4 Squash 2021-12-01 18:09:16 -05:00
20f2cc30a1 What is going on 2021-12-01 17:59:38 -05:00
3b6cccfb89 What is going on 2021-12-01 17:57:23 -05:00
daece0a183 Fix pesky Mint issue 2021-12-01 17:49:09 -05:00
e1449ee4a9 Pull out base 2021-12-01 14:50:04 -05:00
d6b21241a1 Update .gitignore 2021-12-01 14:49:33 -05:00
1a30a35057 Fix services uninstall 2021-12-01 14:43:19 -05:00
05fba4dc88 Fix createrepo 2021-12-01 14:20:47 -05:00
7d31d18d34 Derp 2021-12-01 14:14:50 -05:00
468cfb94af Make runcreaterepo() more resilient 2021-12-01 14:03:42 -05:00
ffa15994a5 bug squash 2021-12-01 12:54:43 -05:00
67d0454633 Fix createrepo 2021-12-01 12:52:42 -05:00
dea1fb5688 Cleanup uninstall() 2021-12-01 10:39:11 -05:00
1f50273e3c Fix local rpm install 2021-11-30 17:48:38 -05:00
d5bcb3c508 Fix some bugs, add prelim opensuse support 2021-11-30 17:46:28 -05:00
f0d93ef8d7 Cleanup installPackage() 2021-11-28 11:56:10 -05:00
c9306263fd Cleanup output 2021-11-24 15:57:33 -05:00
0899b0e70b Improve uninstall() 2021-11-24 15:51:49 -05:00
48ea1d4a40 Improve uninstall() 2021-11-24 15:33:13 -05:00
f9cf7639ba Improve uninstall() 2021-11-24 15:14:12 -05:00
292a5c5472 Make less noisy 2021-11-24 14:56:40 -05:00
ef2d69a1c3 Helpful output 2021-11-24 14:52:21 -05:00
45fd438c51 Add --silent flag for installPackage() 2021-11-24 14:20:20 -05:00
c59bc5726b Cleanup comments 2021-11-24 14:12:36 -05:00
0c9bd9022b Some more cleanup 2021-11-24 10:58:13 -05:00
81aac6eac8 Some more cleanup 2021-11-24 10:48:49 -05:00
28b9d72a2c Tidying up 2021-11-23 14:03:44 -05:00
db64348a9d Don't break userspace 2021-11-23 11:37:37 -05:00
28ec592f13 Fix some EOFs 2021-11-22 18:42:42 -05:00
d212f75140 Refactor 2021-11-22 18:27:13 -05:00
c0ca945b99 Introduce containerized functions 2021-11-22 16:26:09 -05:00
4 changed files with 574 additions and 553 deletions

5
.gitignore vendored
View File

@@ -3,4 +3,7 @@
testing.sh
.lock
tests
test-container.sh
mwe*
test*
container*
Containerfile

View File

@@ -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

View File

@@ -65,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
@@ -79,11 +79,11 @@ jriver-createrepo
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`
#### `jriver-x11vnc` versus `jriver-xvnc`
[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
@@ -121,7 +121,7 @@ It is possible to install multiple services at one time using multiple `--servic
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.

File diff suppressed because it is too large Load Diff