digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Strip env vars when calling vscode (#1667)

Browse Source
This commit is contained in:
Fran 2019-06-14 13:13:53 +01:00 committed by GitHub
parent 52909db9ec
commit aa84930061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daml-assistant/daml-helper/src/DamlHelper.hs
View File

@ -45,6 +45,7 @@ import qualified Network.HTTP.Types as HTTP
import Network.Socket
import System.FilePath
import System.Directory.Extra
import System.Environment
import System.Exit
import System.Info.Extra
import System.Process hiding (runCommand)
@ -102,7 +103,13 @@ runDamlStudio replaceExt remainingArguments = do
| otherwise = "code"
path = fromMaybe "." projectPathM
command = unwords $ codeCommand : path : remainingArguments
exitCode <- withCreateProcess (shell command) $ \_ _ _ -> waitForProcess
-- Strip DAML environment variables before calling vscode.
originalEnv <- getEnvironment
let strippedEnv = filter ((`notElem` damlEnvVars) . fst) originalEnv
process = (shell command) { env = Just strippedEnv }
exitCode <- withCreateProcess process $ \_ _ _ -> waitForProcess
when (exitCode /= ExitSuccess) $
hPutStrLn stderr $
"Failed to launch Visual Studio Code." <>