commit 932489824b7a2fea0a92304ecefe415acc0d72e4
author DRC <dcommander@users.sourceforge.net> Thu Mar 26 18:14:38 2009 +0000
committer DRC <dcommander@users.sourceforge.net> Thu Mar 26 18:14:38 2009 +0000
tree 5a6ed5569eee5250cfddc0b332e26b548bd10617
parent 190854c67a60364b6acebe8fe5eb6e4d4f14b720

Better default xstartup file which attempts to launch the user's chosen window manager before falling back to twm.  This is borrowed from TurboVNC 0.5.1.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3724 3789f03b-4d11-0410-bbf8-ca57d06f2519

unix/vncserver

diff --git a/unix/vncserver b/unix/vncserver
index a263511..a861f58 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -55,6 +55,24 @@
 
 $defaultXStartup
     = ("#!/bin/sh\n\n".
+       "unset SESSION_MANAGER\n".
+       "OS=`uname -s`\n".
+       "if [ \$OS = 'Linux' ]; then\n".
+       "  case \"\$WINDOWMANAGER\" in\n".
+       "    \*gnome\*)\n".
+       "      if [ -e /etc/SuSE-release ]; then\n".
+       "        PATH=\$PATH:/opt/gnome/bin\n".
+       "        export PATH\n".
+       "      fi\n".
+       "      ;;\n".
+       "  esac\n".
+       "fi\n".
+       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
+       "  exec /etc/X11/xinit/xinitrc\n".
+       "fi\n".
+       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
+       "  exec sh /etc/X11/xinit/xinitrc\n".
+       "fi\n".
        "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
        "xsetroot -solid grey\n".
        "vncconfig -iconic &\n".