Auth wont work this way

Signed-off-by: Michal Czyz <[email protected]>

common.sh

@@ -12,6 +12,16 @@ export VNC_RESOLUTION="1920x1080x32"
 export LANG="en_US.UTF-8"
 export LANGUAGE="en_US.UTF-8"
 
+# Try to kill pid based on name
+kill_pid()
+{
+PIDS_TO_KILL=$(ps axjf | grep $1 | awk '{print $2}')
+for PID in ${PIDS_TO_KILL[@]}; do
+    echo "Attempting to kill $PID"
+    kill -9 $PID
+done
+}
+
 # Execute the command it not already running
 startInBackgroundIfNotRunning()
 {

desktop-update.sh

@@ -22,8 +22,7 @@ sudoIf chown root:${group_name} /tmp/.X11-unix
 if [ "$(echo "${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=${VNC_RESOLUTION}x16; fi
 screen_geometry="${VNC_RESOLUTION%*x*}"
 screen_depth="${VNC_RESOLUTION##*x}"
-startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver ${DISPLAY} -geometry ${screen_geometry} -depth ${screen_depth} -rfbport 5901 -dpi ${VNC_DPI:-96} -localhost -desktop fluxbox -fg"
-#  -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd
+startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver ${DISPLAY} -geometry ${screen_geometry} -depth ${screen_depth} -rfbport 5901 -dpi ${VNC_DPI:-96} -localhost -desktop fluxbox -fg" -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd
 
 # Spin up noVNC if installed and not running.
 if [ -d "/usr/local/novnc" ] && [ "$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then

update-config.sh

@@ -52,17 +52,11 @@ EOF
 
 echo "${fluxbox_menu}" > ~/.fluxbox/menu
 
-# Try to kill existing tigervncserver
-PIDS_TO_KILL=$(ps axjf | grep tigervncserver | awk '{print $2}')
-echo "PIDS TO KILL = $PIDS_TO_KILL"
-pkill -9 "${PIDS_TO_KILL[0]}"
-
-# Try to kill existing novnc
-PIDS_TO_KILL=$(ps axjf | grep novnc | awk '{print $2}')
-echo "PIDS TO KILL = $PIDS_TO_KILL"
-pkill -9 "${PIDS_TO_KILL[0]}"
+kill_pid tigervncserver
+kill_pid novnc
 
 ps axjf | grep tigervncserver
 ps axjf | grep novnc
 
 bash desktop-update.sh
+# rm -f /usr/local/etc/vscode-dev-containers/vnc-passwd