Merge branch 'patch-1' of https://github.com/Siot/tigervnc

diff --cc unix/vncserver
index c7fdc655d7378d4fbbb5e4f8faa034536804750c,093d9acd633c906815007502023590ab371aa74b..d7cd711ed76048e69e5783ef5a48709ce87c7733
--- 1/unix/vncserver
--- 2/unix/vncserver
+++ b/unix/vncserver
@@@ -355,27 -317,21 +359,31 @@@ warn "\nNew '$desktopName' desktop is $
  
  # Create the user's xstartup script if necessary.
  
- if (!(-e "$vncUserDir/xstartup")) {
-     warn "Creating default startup script $vncUserDir/xstartup\n";
-     open(XSTARTUP, ">$vncUserDir/xstartup");
-     print XSTARTUP $defaultXStartup;
-     close(XSTARTUP);
-     chmod 0755, "$vncUserDir/xstartup";
+ if (! $skipxstartup) {
+     if (!(-e "$vncUserDir/xstartup")) {
+         warn "Creating default startup script $vncUserDir/xstartup\n";
+         open(XSTARTUP, ">$vncUserDir/xstartup");
+         print XSTARTUP $defaultXStartup;
+         close(XSTARTUP);
+         chmod 0755, "$vncUserDir/xstartup";
+     }
  }
  
 +# Create the user's config file if necessary.
 +
 +if (!(-e "$vncUserDir/config")) {
 +    warn "Creating default config $vncUserDir/config\n";
 +    open(XSTARTUP, ">$vncUserDir/config");
 +    print XSTARTUP $defaultConfig;
 +    close(XSTARTUP);
 +    chmod 0644, "$vncUserDir/config";
 +}
 +
  # Run the X startup script.
  
- warn "Starting applications specified in $vncUserDir/xstartup\n";
+ if (! $skipxstartup) {
+     warn "Starting applications specified in $vncUserDir/xstartup\n";
+ }
  warn "Log file is $desktopLog\n\n";
  
  # If the unix domain socket exists then use that (DISPLAY=:n) otherwise use

diff --cc unix/vncserver.man
Simple merge