Fix vnc start script

Author: lukasmasuch

resources/scripts/start-vnc-server.sh

@@ -23,8 +23,6 @@ touch $HOME/.vnc/passwd
 echo "$VNC_PW" | vncpasswd -f >> $HOME/.vnc/passwd
 chmod 600 $HOME/.vnc/passwd
 
-# Setting pidfile + command to execute
-pidfile="$HOME/.vnc/*:1.pid"
 config_file=$HOME/.vnc/config
 touch $config_file
 printf "geometry=$VNC_RESOLUTION\ndepth=$VNC_COL_DEPTH\ndesktop=Desktop-GUI\nsession=xfce" > ~/.vnc/config
@@ -33,16 +31,28 @@ command="/usr/libexec/vncserver $DISPLAY"
 # Proxy signals
 function kill_app(){
     # correct forwarding of shutdown signal
-    kill -s SIGTERM $!
+    _wait_pid=$!
+    kill -s SIGTERM $_wait_pid
     trap - SIGTERM && kill -- -$$
-    kill $(cat $pidfile)
+    if [ -n "$(pidof xinit)" ] ; then
+        ### ignore the errors if not alive any more
+        kill $(pidof xinit) > /dev/null 2>&1
+    fi
     exit 0 # exit okay
 }
-trap "kill_app" SIGINT SIGTERM EXIT
+trap "kill_app" SIGINT SIGTERM SIGQUIT EXIT
+
+# Old way: is not supported in tiger vnc 11
+# /usr/libexec/vncserver -kill $DISPLAY &
+
+# Kill vnc server via the xinit script
+# init_pid="$(pidof xinit)"
+if [ -n "$(pidof xinit)" ] ; then
+    ### ignore the errors if not alive any more
+    kill $(pidof xinit) > /dev/null 2>&1
+fi
 
 #cleanup tmp from previous run
-# run vncserver kill in background
-/usr/libexec/vncserver -kill $DISPLAY &
 rm -rfv /tmp/.X*-lock /tmp/.x*-lock /tmp/.X11-unix
 # Delete existing logs
 find $HOME/.vnc/ -name '*.log' -delete
@@ -51,19 +61,23 @@ find $HOME/.vnc/ -name '*.log' -delete
 # Launch daemon
 
 sleep 1
-$command
-sleep 4
+$command &> "$HOME/.vnc/vnc.log" &
+sleep 5
+
+_wait_pid=$!
 
-tail -f -q --pid $(cat $pidfile) $HOME/.vnc/*.log &
+echo "Started VNC Server $_wait_pid"
+
+tail -f -q --pid $_wait_pid $HOME/.vnc/*.log &
 
 # Disable screensaver and power management - needs to run after the vnc server is started
-xset -dpms && xset s noblank && xset s off
+xset s noblank && xset s off
+# dpms option not available: xset -display :1 -dpms &&
 
 # Loop while the pidfile and the process exist
 echo "Starting monitoring pid file for vnc server"
-while [ -f $pidfile ] && kill -0 $(cat $pidfile) ; do
+while kill -0 $_wait_pid ; do
     sleep 1
 done
 
-
 exit 1000 # exit unexpected