Sfoglia il codice sorgente

work around a bug in OSX regarding garbled $PATH

rdb 14 anni fa
parent
commit
cc5c26743c
1 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. 3 1
      makepanda/makepanda.py

+ 3 - 1
makepanda/makepanda.py

@@ -5489,7 +5489,9 @@ def MakeInstallerOSX():
     oscmd("mkdir -p dstroot/tools/Developer/Tools/Panda3D")
     oscmd("mkdir -p dstroot/tools/Developer/Panda3D")
     oscmd("mkdir -p dstroot/tools/etc/paths.d")
-    WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/Developer/Tools/Panda3D")
+    # Trailing newline is important, works around a bug in OSX
+    WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/Developer/Tools/Panda3D\n")
+
     for base in os.listdir(GetOutputDir()+"/bin"):
         binname = "dstroot/tools/Developer/Tools/Panda3D/" + base
         # OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird.