2020-05-29 06:06:01 +00:00
|
|
|
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
|
2024-07-27 06:49:29 +00:00
|
|
|
index 2e83712bb8..2dd0bf73d2 100644
|
2020-05-29 06:06:01 +00:00
|
|
|
--- a/xpra/server/server_util.py
|
|
|
|
|
+++ b/xpra/server/server_util.py
|
2024-07-27 06:49:29 +00:00
|
|
|
@@ -166,6 +166,10 @@ def xpra_env_shell_script(socket_dir, env : Dict[str,str]) -> str:
|
|
|
|
|
return "\n".join(script)
|
2020-06-18 07:06:33 +00:00
|
|
|
|
2024-07-27 06:49:29 +00:00
|
|
|
def xpra_runner_shell_script(xpra_file:str, starting_dir:str) -> str:
|
2020-06-18 07:06:33 +00:00
|
|
|
+ # Nixpkgs contortion:
|
|
|
|
|
+ # xpra_file points to a shell wrapper, not to the python script.
|
|
|
|
|
+ dirname, basename = os.path.split(xpra_file)
|
|
|
|
|
+ xpra_file = os.path.join(dirname, "."+basename+"-wrapped")
|
2022-01-25 03:21:06 +00:00
|
|
|
# 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.
|
2024-07-27 06:49:29 +00:00
|
|
|
qdir = sh_quotemeta(starting_dir)
|
