Merge pull request #35 from cmd-ntrf/user_xstartup

Let user defines its own xstartup and geometry
jupyterhub · Sep 14, 2023 · a016a6d · a016a6d
2 parents 3aac4d2 + fb47c59
commit a016a6d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/jupyter_remote_desktop_proxy/__init__.py b/jupyter_remote_desktop_proxy/__init__.py
@@ -31,19 +31,21 @@ def setup_desktop():
         vnc_args = [vncserver]
         socket_args = []
 
+    if not os.path.exists(os.path.expand('~/.vnc/xstartup')):
+        vnc_args.extend(['-xstartup', os.path.join(HERE, 'share/xstartup')])
+
     vnc_command = shlex.join(
         vnc_args
         + [
             '-verbose',
-            '-xstartup',
-            os.path.join(HERE, 'share/xstartup'),
             '-geometry',
             '1680x1050',
             '-SecurityTypes',
             'None',
             '-fg',
         ]
     )
+
     return {
         'command': [
             'websockify',