Update Project to use new environment module

This commit is contained in:
Lee Dohm
2016-03-08 15:50:53 -08:00
committed by Joe Fitzgerald
parent c7465f5f7e
commit a3ba15c8a1
2 changed files with 13 additions and 50 deletions

View File

@@ -288,8 +288,9 @@ class Project extends Model
unless @env?
@env = _.clone(process.env)
if process.platform is "darwin" and not process.env.TERM?
shellPath = @getShellPath()
@env.PATH = shellPath if shellPath?
{getShellEnv} = require("../src/environment")
shellEnv = getShellEnv()
@env = shellEnv if shellEnv?
_.clone(@env)
@@ -297,44 +298,6 @@ class Project extends Model
Section: Private
###
# Gets the user's configured shell `PATH`.
#
# Returns the value of `PATH` or `undefined` if there was an error.
getShellPath: ->
shellEnvText = @getShellEnv()
return unless shellEnvText?
env = {}
for line in shellEnvText.split(os.EOL)
if line.includes("=")
components = line.split("=")
if components.length is 2
env[components[0]] = components[1]
else
k = components.shift()
v = components.join("=")
env[k] = v
env.PATH
# Gets a dump of the user's configured shell environment.
#
# Returns the output of the `env` command or `undefined` if there was an error.
getShellEnv: ->
shell = process.env.SHELL ? "/bin/bash"
# The `-ilc` set of options was tested to work with the OS X v10.11
# default-installed versions of bash, zsh, sh, and ksh. It *does not*
# work with csh or tcsh. Given that bash and zsh should cover the
# vast majority of users and it gracefully falls back to prior behavior,
# this should be safe.
results = child_process.spawnSync shell, ["-ilc"], input: "env", encoding: "utf8"
return if results.error?
return unless results.stdout and results.stdout.length > 0
results.stdout
consumeServices: ({serviceHub}) ->
serviceHub.consume(
'atom.directory-provider',