archive-gh-me/env-cmd
1
0
Fork 0
mirror of https://github.com/toddbluhm/env-cmd.git synced 2025-12-08 18:23:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15 from toddbluhm/fix-add-system-envs

Browse Source 
Add system env vars back into the env list
This commit is contained in:
Todd Bluhm 2016-12-06 21:38:27 -08:00 committed by GitHub
commit 1f02ee0640
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/index.js
View File

@ -10,7 +10,10 @@ function EnvCmd (args) {
const parsedArgs = ParseArgs(args)
// If a .rc file was found then use that
const env = fs.existsSync(rcFileLocation) ? UseRCFile(parsedArgs) : UseCmdLine(parsedArgs)
let env = fs.existsSync(rcFileLocation) ? UseRCFile(parsedArgs) : UseCmdLine(parsedArgs)
// Add in the system environment variables to our environment list
env = Object.assign({}, process.env, env)
// Execute the command with the given environment variables
const proc = spawn(parsedArgs.command, parsedArgs.commandArgs, {
@ -138,7 +141,7 @@ function UseCmdLine (parsedArgs) {
// Parse the env file string using the correct parser
const env = ext === '.json' || ext === '.js'
? Object.assign({}, process.env, require(envFilePath))
? require(envFilePath)
: ParseEnvString(file)
return env