Only use shell-env on mac

lgeiger · lgeiger · commit 5434cc0c4c4a · 2017-10-12T22:53:38.000-05:00
diff --git a/lib/main.js b/lib/main.js
@@ -29,7 +29,8 @@ class PythonLanguageClient extends AutoLanguageClient {
   }
 
   async startServerProcess(projectPath) {
-    const env = await shellEnv();
+    // For some reason Atom only detects the correct env if started from the command line on Mac.
+    const env = process.platform === "darwin" ? await shellEnv() : process.env;
     const childProcess = cp.spawn(atom.config.get("ide-python.pylsPath"), {
       cwd: projectPath,
       env: env

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ class PythonLanguageClient extends AutoLanguageClient {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`async startServerProcess(projectPath) {`
`32`		`- const env = await shellEnv();`
	`32`	`+ // For some reason Atom only detects the correct env if started from the command line on Mac.`
	`33`	`+ const env = process.platform === "darwin" ? await shellEnv() : process.env;`
`33`	`34`	`const childProcess = cp.spawn(atom.config.get("ide-python.pylsPath"), {`
`34`	`35`	`cwd: projectPath,`
`35`	`36`	`env: env`