Changeset 4a26b1204839743e2d7d6eda1cebec0548655602

Timestamp:

11/13/08 01:44:11 (2 months ago)

Author:

njs@…

Branch:

org.vorpus.parti

Parent:

d1f9fd273d45a48775411b0499141f17f24b793d

Message:

Correctly save the working dir in run-xpra.sh (thanks to Paul Marks for the catch)

Files:

• /xpra/scripts/server.py (modified) (5 diffs)

/xpra/scripts/server.py

@@ +1 @@
+
 # DO NOT IMPORT GTK HERE: see http://partiwm.org/ticket/34
 # (also do not import anything that imports gtk)
@@ -89 +90 @@
     return "\"%s\"" % ("".join(quoted_chars),)
 
-def xpra_runner_shell_script(xpra_file):
+def xpra_runner_shell_script(xpra_file, starting_dir):
     script = []
     script.append("#!/bin/sh\n")
@@ -103 +104 @@
     # We ignore failures in cd'ing, b/c it's entirely possible that we were
     # started from some temporary directory and all paths are absolute.
-    script.append("cd %s\n" % sh_quotemeta(os.getcwd()))
+    script.append("cd %s\n" % sh_quotemeta(starting_dir))
     script.append("_XPRA_PYTHON=%s\n" % (sh_quotemeta(sys.executable),))
     script.append("_XPRA_SCRIPT=%s\n" % (sh_quotemeta(xpra_file),))
@@ -148 +149 @@
     # than expected.
     scriptpath = os.path.join(sockdir.dir(), "run-xpra")
+
+    # Save the starting dir now, because we'll lose track of it when we
+    # daemonize:
+    starting_dir = os.getcwd()
 
     # Daemonize:
@@ -188 +193 @@
     # Write out a shell-script so that we can start our proxy in a clean
     # environment:
-    open(scriptpath, "w").write(xpra_runner_shell_script(xpra_file))
+    open(scriptpath, "w").write(xpra_runner_shell_script(xpra_file,
+                                                         starting_dir))
     # Unix is a little silly sometimes:
     umask = os.umask(0)