Debug ubuntu repo-install

installJRMC

@@ -928,43 +928,13 @@ EOF"
 
 
     #######################################
-    # Create the x11vnc password file
+    # Create the VNC password file
+    # Requires:
+    #   _vncpass
     # Globals:
     #   _novncauth
     # Returns:
-    #   0 if password created sucessfully, 1 if not
+    #   0 if ports opened sucessfully, 1 if not
-    #######################################
-    _setX11VNCPass() {
-
-        _runDebug "${FUNCNAME[0]}"
-
-        _vncpassfile="$HOME/.vnc/jrmc_passwd"
-
-        if [[ -f "$_vncpassfile" ]]; then
-            if [[ -z $_vncpass ]]; then
-                err "Refusing to overwrite existing $_vncpassfile with an empty password"
-                err "Remove existing $_vncpassfile or set --vncpass to use an empty password"
-                exit 1
-            else
-                rm -f "$_vncpassfile"
-            fi
-        fi
-
-        if [[ -n $_vncpass ]]; then
-            if ! x11vnc -storepasswd "$_vncpass" "$_vncpassfile"; then
-                err "Could not create VNC password file"
-                return 1
-            fi
-        else
-            _novncauth="true"
-        fi
-    }
-
-
-    #######################################
-    # Create the vncserver password file
-    # Returns:
-    #   0 if password created sucessfully, 1 if not
     #######################################
     _setVNCPass() {
 
@@ -972,21 +942,15 @@ EOF"
 
         _vncpassfile="$HOME/.vnc/jrmc_passwd"
 
-        if [[ -f "$_vncpassfile" ]]; then
+        if [[ -n $_vncpass ]]; then
-            if [[ -z $_vncpass ]]; then
+            # Remove existing password file if it exists and write a new one
-                err "Refusing to overwrite existing $_vncpassfile with an empty password"
+            [[ -f "$_vncpassfile" ]] && rm -f "$_vncpassfile"
-                err "Remove existing $_vncpassfile or set --vncpass to use an empty password"
+            if ! x11vnc -storepasswd "$_vncpass" "$_vncpassfile"; then
-                exit 1
+                err "Could not create VNC password file"
-            else
+                return 1
-                rm -f "$_vncpassfile"
             fi
-        fi
+        elif [[ ! -f "$_vncpassfile" ]]; then
-
+            _novncauth="true"
-        [[ -z $_vncpass ]] && _vncpass=""
-
-        if ! echo "$_vncpass" | vncpasswd -f > "$_vncpassfile"; then
-            err "Could not create VNC password file"
-            return 1
         fi
     }
 
@@ -1011,6 +975,8 @@ EOF"
             _timer_name="jriver-${1}@$_user.timer"
             _user_specifier="User=%I"
         fi
+
+        [[ -z $_display ]] && _display="${DISPLAY:-":0"}"
     }
 
 
@@ -1018,8 +984,6 @@ EOF"
 
         _runDebug "${FUNCNAME[0]}"
 
-        [[ -z $_display ]] && _display="${DISPLAY:-":0"}"
-
         _bash_cmd "cat <<-EOF > $_service_fname
 [Unit]
 Description=JRiver Media Center $_mversion Media Server
@@ -1047,8 +1011,6 @@ EOF"
 
         _runDebug "${FUNCNAME[0]}"
 
-        [[ -z $_display ]] && _display="${DISPLAY:-":0"}"
-
         _bash_cmd "cat <<-EOF > $_service_fname
 [Unit]
 Description=JRiver Media Center $_mversion
@@ -1076,12 +1038,11 @@ EOF"
 
         _runDebug "${FUNCNAME[0]}"
 
-        _installPackage tigervnc-server
-
         _setVNCPass
 
+        _installPackage tigervnc-server
+
         if [[ -z $_display ]]; then
-            # If we are running on existing X server then increment DISPLAY by one
             if [[ -n $DISPLAY ]]; then
                 _display=$(( ${DISPLAY#:} + 1 ))
                 _display=":$_display"
@@ -1090,6 +1051,12 @@ EOF"
             fi
         fi
 
+        if [[ "$_novncauth" == "true" ]]; then
+            _exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg"
+        else
+            _exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd"
+        fi
+
         _bash_cmd "cat <<-EOF > $_service_fname
 [Unit]
 Description=Remote desktop service (VNC)
@@ -1099,7 +1066,7 @@ After=syslog.target network.target
 Type=simple
 $_user_specifier
 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
+ExecStart=$_exec_start_cmd
 ExecStop=/usr/bin/vncserver -kill $_display
 
 [Install]
@@ -1115,7 +1082,7 @@ EOF"
 
         _installPackage x11vnc
 
-        _setX11VNCPass
+        _setVNCPass
 
         if [[ "$_novncauth" == "true" ]]; then
             _exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -nopw"