1 Commits

Author SHA1 Message Date
4382f14695 Debug - do not use 2020-04-24 17:32:44 -04:00

View File

@@ -74,17 +74,13 @@ OPTIONS
Uninstall JRiver MC, cleanup service files, and remove firewall rules (does not remove library files) Uninstall JRiver MC, cleanup service files, and remove firewall rules (does not remove library files)
SERVICES SERVICES
mediaserver mediaserver
Create and enable a mediaserver systemd service (requires an existing X server) Create and enable a mediaserver systemd service (requires an existing X server)
mediacenter mediacenter
Create and enable a mediacenter systemd service (requires an existing X server) Create and enable a mediacenter systemd service (requires an existing X server)
x11vnc x11vnc
Create and enable an x11vnc server (requires an existing X server) Create and enable an x11vnc server (requires an existing X server)
--vncpass and --display are valid options (see below) --vncpass and --display are valid options (see below)
vncserver vncserver
Create and enable a new VNC X server Create and enable a new VNC X server
@@ -94,9 +90,14 @@ OPTIONS
--display DISPLAY --display DISPLAY
Display to start vncserver/x11vnc (Default: The current display or :0 if current display Display to start vncserver/x11vnc (Default: The current display or :0 if current display
is unaccessible) is unaccessible)
createrepo createrepo
Install hourly service to build latest MC RPM and run createrepo Install hourly service to build latest MC RPM and run createrepo
TODO:
CONTAINERS
mediaserver
mediacenter
createrepo
EOF EOF
# Exit using passed exit code # Exit using passed exit code
@@ -986,11 +987,13 @@ EOF"
fi fi
fi fi
[[ -z $_vncpass ]] && _vncpass="" if [[ -n $_vncpass ]]; then
if ! echo "$_vncpass" | vncpasswd -f > "$_vncpassfile"; then
if ! echo "$_vncpass" | vncpasswd -f > "$_vncpassfile"; then err "Could not create VNC password file"
err "Could not create VNC password file" return 1
return 1 fi
else
_novncauth="true"
fi fi
} }
@@ -1084,6 +1087,24 @@ EOF"
_setVNCPass _setVNCPass
if [[ -n $_novncauth ]]; then
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -SecurityTypes None -xstartup $HOME/.vnc/jrmc-xstartup"
else
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd -xstartup $HOME/.vnc/jrmc-xstartup"
fi
if [[ -n $_novncauth ]]; then
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -SecurityTypes None -xstartup /usr/bin/mediacenter$_mversion"
else
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd -xstartup /usr/bin/mediacenter$_mversion"
fi
if [[ -n $_novncauth ]]; then
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -SecurityTypes None -xstartup /usr/bin/xterm"
else
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd -xstartup /usr/bin/xterm"
fi
echo "mediacenter$_mversion" > "$HOME/.vnc/jrmc-xstartup" echo "mediacenter$_mversion" > "$HOME/.vnc/jrmc-xstartup"
if [[ -z $_display ]]; then if [[ -z $_display ]]; then
@@ -1105,7 +1126,7 @@ After=syslog.target network.target
Type=simple Type=simple
$_user_specifier $_user_specifier
ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill $_display > /dev/null 2>&1 || :' ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill $_display > /dev/null 2>&1 || :'
ExecStart=/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd -xstartup $HOME/.vnc/jrmc-xstartup ExecStart=$_exec_start_cmd
ExecStop=/usr/bin/vncserver -kill $_display ExecStop=/usr/bin/vncserver -kill $_display
[Install] [Install]
@@ -1123,7 +1144,7 @@ EOF"
_setX11VNCPass _setX11VNCPass
if [[ "$_novncauth" == "true" ]]; then if [[ -n $_novncauth ]]; then
_exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -nopw" _exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -nopw"
else else
_exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -rfbauth $HOME/.vnc/jrmc_passwd" _exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -rfbauth $HOME/.vnc/jrmc_passwd"