wasp-lang/wasp
1
1
Fork 0
mirror of https://github.com/wasp-lang/wasp.git synced 2024-12-25 01:52:00 +03:00
Code Issues Projects Releases Wiki Activity

Fix environment variable overriding in processes (#1028)

Browse Source
This commit is contained in:
Filip Sodić 2023-02-24 14:00:10 +01:00 committed by GitHub
parent 799db73f34
commit 3264b7c66b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
waspc/src/Wasp/Generator/Job/Process.hs
View File

@ -111,7 +111,10 @@ runNodeCommandAsJobWithExtraEnv extraEnvVars fromDir command args jobType chan =
runProcessAsJob nodeCommandProcess jobType chan runProcessAsJob nodeCommandProcess jobType chan
else exitWithError (ExitFailure 1) (T.pack $ makeNodeVersionMismatchMessage nodeVersion) else exitWithError (ExitFailure 1) (T.pack $ makeNodeVersionMismatchMessage nodeVersion)
where where
getAllEnvVars = (++ extraEnvVars) <$> getEnvironment -- Haskell will use the first value for variable name it finds. Since env
-- vars in 'extraEnvVars' should override the the inherited env vars, we
-- must prepend them.
getAllEnvVars = (extraEnvVars ++) <$> getEnvironment
exitWithError exitCode errorMsg = do exitWithError exitCode errorMsg = do
writeChan chan $ writeChan chan $
J.JobMessage J.JobMessage