From cd3dfe69114622c1e90aaef570aeb51a05b8fb37 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 3 Jun 2010 20:57:57 +0000
Subject: [PATCH] preserve PATH

---
 direct/src/plugin/p3dSession.cxx | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/direct/src/plugin/p3dSession.cxx b/direct/src/plugin/p3dSession.cxx
index c3903efe0b..1be6eb316e 100644
--- a/direct/src/plugin/p3dSession.cxx
+++ b/direct/src/plugin/p3dSession.cxx
@@ -753,6 +753,8 @@ start_p3dpython(P3DInstance *inst) {
     keep_pythonpath = (inst->get_fparams().lookup_token_int("keep_pythonpath") != 0);
   }
 
+  string sys_path = search_path;
+  string ld_path = search_path;
   string dyld_path = search_path;
   string python_path = search_path;
   string prc_path = prc_root + sep + search_path;
@@ -910,13 +912,33 @@ start_p3dpython(P3DInstance *inst) {
     }
   }
 
+  // We also append the original PATH et al to the *end* of the new
+  // definitions, even if keep_user_env is not set.  This is necessary
+  // for os.system() and such to work as expected within the embedded
+  // app.  It's also necessary for webbrowser on Linux.
+  char *orig_path = getenv("PATH");
+  if (orig_path != NULL) {
+    sys_path += sep;
+    sys_path += orig_path;
+  }
+  char *orig_ld_path = getenv("LD_LIBRARY_PATH");
+  if (orig_ld_path != NULL) {
+    ld_path += sep;
+    ld_path += orig_ld_path;
+  }
+  char *orig_dyld_path = getenv("DYLD_LIBRARY_PATH");
+  if (orig_dyld_path != NULL) {
+    dyld_path += sep;
+    dyld_path += orig_dyld_path;
+  }
+
   // Define some new environment variables.
   _env += "PATH=";
-  _env += search_path;
+  _env += sys_path;
   _env += '\0';
 
   _env += "LD_LIBRARY_PATH=";
-  _env += search_path;
+  _env += ld_path;
   _env += '\0';
 
   _env += "DYLD_LIBRARY_PATH=";