bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Bug squash

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-13 22:33:22 -05:00
parent 717a3f9f7f
commit d61bdd4842
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
installJRMC
View File

@@ -777,7 +777,7 @@ restoreLicense() {
####################################### #######################################
# Opens ports using the system firewall tool # Opens ports using the system firewall tool
# Arguments # Arguments:
# Pre-defined service to enable # Pre-defined service to enable
####################################### #######################################
openFirewall() { openFirewall() {
@@ -911,6 +911,8 @@ setDisplay() {
####################################### #######################################
# Create associated service variables based on service name # Create associated service variables based on service name
# Arguments
# Pre-defined service to enable
####################################### #######################################
setServiceVars() { setServiceVars() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
@@ -965,7 +967,7 @@ setServiceVars() {
service_jriver-mediacenter() { service_jriver-mediacenter() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
setServiceVars setServiceVars "${FUNCNAME[0]##*_}"
sudo bash -c "cat <<- EOF > $SERVICE_FNAME sudo bash -c "cat <<- EOF > $SERVICE_FNAME
[Unit] [Unit]
@@ -999,7 +1001,7 @@ service_jriver-mediacenter() {
service_jriver-mediaserver() { service_jriver-mediaserver() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
setServiceVars setServiceVars "${FUNCNAME[0]##*_}"
service_jriver-mediacenter "/MediaServer" service_jriver-mediacenter "/MediaServer"
} }
@@ -1011,7 +1013,7 @@ service_jriver-mediaserver() {
service_jriver-xvnc() { service_jriver-xvnc() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
setServiceVars setServiceVars "${FUNCNAME[0]##*_}"
setDisplay setDisplay
declare start_cmd declare start_cmd
declare -g PORT=$(( NEXT_DISPLAYNUM + 5900 )) declare -g PORT=$(( NEXT_DISPLAYNUM + 5900 ))
@@ -1026,8 +1028,6 @@ service_jriver-xvnc() {
start_cmd="/usr/bin/vncserver $NEXT_DISPLAY -geometry 1440x900 -alwaysshared -rfbauth $HOME/.vnc/jrmc_passwd -autokill -xstartup /usr/bin/mediacenter$MVERSION" start_cmd="/usr/bin/vncserver $NEXT_DISPLAY -geometry 1440x900 -alwaysshared -rfbauth $HOME/.vnc/jrmc_passwd -autokill -xstartup /usr/bin/mediacenter$MVERSION"
fi fi
debug "SERVICE_FNAME = $SERVICE_FNAME"
sudo bash -c "cat <<- EOF > $SERVICE_FNAME sudo bash -c "cat <<- EOF > $SERVICE_FNAME
[Unit] [Unit]
Description=Remote desktop service (VNC) Description=Remote desktop service (VNC)
@@ -1061,7 +1061,7 @@ service_jriver-xvnc() {
service_jriver-x11vnc() { service_jriver-x11vnc() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
setServiceVars setServiceVars "${FUNCNAME[0]##*_}"
setDisplay setDisplay
declare start_cmd declare start_cmd
@@ -1121,9 +1121,9 @@ service_jriver-createrepo() {
declare cr_user="${CREATEREPO_USER:$USER}" declare cr_user="${CREATEREPO_USER:$USER}"
if [[ "$USER" != "$cr_user" ]]; then if [[ "$USER" != "$cr_user" ]]; then
USER="root" SERVICE_TYPE="system" setServiceVars USER="root" SERVICE_TYPE="system" setServiceVars "${FUNCNAME[0]##*_}"
else else
setServiceVars setServiceVars "${FUNCNAME[0]##*_}"
fi fi
sudo bash -c "cat <<-EOF > $SERVICE_FNAME sudo bash -c "cat <<-EOF > $SERVICE_FNAME