Don't update the NODE_PATH when updating the environment on launch

Signed-off-by: Nathan Sobo <nathan@github.com>

src/environment-helpers.js

@@ -1,116 +0,0 @@
-'use babel'
-
-import {spawnSync} from 'child_process'
-import os from 'os'
-
-// Gets a dump of the user's configured shell environment.
-//
-// Returns the output of the `env` command or `undefined` if there was an error.
-function getRawShellEnv () {
-  let shell = getUserShell()
-
-  // The `-ilc` set of options was tested to work with the macOS v10.11
-  // default-installed versions of bash, zsh, sh, and ksh. It *does not*
-  // work with csh or tcsh.
-  let results = spawnSync(shell, ['-ilc', 'env'], {encoding: 'utf8'})
-  if (results.error || !results.stdout || results.stdout.length <= 0) {
-    return
-  }
-
-  return results.stdout
-}
-
-function getUserShell () {
-  if (process.env.SHELL) {
-    return process.env.SHELL
-  }
-
-  return '/bin/bash'
-}
-
-// Gets the user's configured shell environment.
-//
-// Returns a copy of the user's shell enviroment.
-function getFromShell () {
-  let shellEnvText = getRawShellEnv()
-  if (!shellEnvText) {
-    return
-  }
-
-  let env = {}
-
-  for (let line of shellEnvText.split(os.EOL)) {
-    if (line.includes('=')) {
-      let components = line.split('=')
-      if (components.length === 2) {
-        env[components[0]] = components[1]
-      } else {
-        let k = components.shift()
-        let v = components.join('=')
-        env[k] = v
-      }
-    }
-  }
-
-  return env
-}
-
-function needsPatching (options = { platform: process.platform, env: process.env }) {
-  if (options.platform === 'darwin' && !options.env.PWD) {
-    let shell = getUserShell()
-    if (shell.endsWith('csh') || shell.endsWith('tcsh') || shell.endsWith('fish')) {
-      return false
-    }
-    return true
-  }
-
-  return false
-}
-
-// Fix for #11302 because `process.env` on Windows is a magic object that offers case-insensitive
-// environment variable matching. By always cloning to `process.env` we prevent breaking the
-// underlying functionality.
-function clone (to, from) {
-  for (var key in to) {
-    // Don't erase NODE_ENV. Fixes #12024
-    if (key !== 'NODE_ENV') {
-      delete to[key]
-    }
-  }
-
-  Object.assign(to, from)
-}
-
-function normalize (options = {}) {
-  if (options && options.env) {
-    clone(process.env, options.env)
-  }
-
-  if (!options.env) {
-    options.env = process.env
-  }
-
-  if (!options.platform) {
-    options.platform = process.platform
-  }
-
-  if (needsPatching(options)) {
-    // Patch the `process.env` on startup to fix the problem first documented
-    // in #4126. Retain the original in case someone needs it.
-    let shellEnv = getFromShell()
-    if (shellEnv && shellEnv.PATH) {
-      process._originalEnv = Object.assign({}, process.env)
-      clone(process.env, shellEnv)
-    }
-  }
-}
-
-function replace (env) {
-  if (!env || !env.PATH) {
-    return
-  }
-
-  clone(process.env, env)
-}
-
-export default { getFromShell, needsPatching, normalize, replace }

src/initialize-application-window.coffee

@@ -1,15 +1,13 @@
 # Like sands through the hourglass, so are the days of our lives.
 module.exports = ({blobStore}) ->
-  environmentHelpers = require('./environment-helpers')
+  updateProcessEnv = require('./update-process-env')
   path = require 'path'
   require './window'
   {getWindowLoadSettings} = require './window-load-settings-helpers'
   {ipcRenderer} = require 'electron'
   {resourcePath, isSpec, devMode, env} = getWindowLoadSettings()
 
-  # Set baseline environment
-  environmentHelpers.normalize({env: env})
-  env = process.env
+  updateProcessEnv(env)
 
   # Add application-specific exports to module search path.
   exportsPath = path.join(resourcePath, 'exports')
@@ -37,5 +35,5 @@ module.exports = ({blobStore}) ->
       setTimeout (-> document.querySelector('atom-workspace').focus()), 0
     window.addEventListener('focus', windowFocused)
     ipcRenderer.on('environment', (event, env) ->
-      environmentHelpers.replace(env)
+      updateProcessEnv(env)
     )

src/update-process-env.js

@@ -0,0 +1,49 @@
+/** @babel */
+
+import {spawnSync} from 'child_process'
+
+const ENVIRONMENT_VARIABLES_TO_PRESERVE = new Set(['NODE_ENV', 'NODE_PATH'])
+
+export default function updateProcessEnv (launchEnv) {
+  let envToAssign
+  if (launchEnv.PWD) {
+    envToAssign = launchEnv
+  } else {
+    if (process.platform === 'darwin') {
+      envToAssign = getEnvFromShell()
+    }
+  }
+
+  if (envToAssign) {
+    for (let key in process.env) {
+      if (!ENVIRONMENT_VARIABLES_TO_PRESERVE.has(key)) {
+        delete process.env[key]
+      }
+    }
+
+    for (let key in envToAssign) {
+      if (!ENVIRONMENT_VARIABLES_TO_PRESERVE.has(key)) {
+        process.env[key] = envToAssign[key]
+      }
+    }
+  }
+}
+
+function getEnvFromShell () {
+  let shell = process.env.SHELL
+  if (shell && (shell.endsWith('/bash') || shell.endsWith('/sh'))) {
+    let {stdout} = spawnSync(shell, ['-ilc', 'env'], {encoding: 'utf8'})
+    if (stdout) {
+      let result = {}
+      for (let line of stdout.split('\n')) {
+        if (line.includes('=')) {
+          let components = line.split('=')
+          let key = components.shift()
+          let value = components.join('=')
+          result[key] = value
+        }
+      }
+      return result
+    }
+  }
+}