Fix 'ghcup run' on windows, fixes #375

2022-06-06 20:18:10 +02:00 · 2022-06-06 20:18:10 +02:00 · fe620835be
commit fe620835be
parent c7dc77e6bc
1 changed files with 7 additions and 0 deletions
--- a/lib/GHCup/Prelude/Process/Windows.hs
+++ b/lib/GHCup/Prelude/Process/Windows.hs
@ -206,6 +206,13 @@ exec :: MonadIO m
     -> Maybe [(String, String)] -- ^ optional environment
     -> m (Either ProcessError ())
 exec exe args chdir env = do
+  -- https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
+  forM_ (Map.fromList <$> env) $ \cEnv -> do
+    let paths = ["PATH", "Path"]
+        curPaths = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
+        newPath = intercalate [searchPathSeparator] curPaths
+    setEnv "PATH" ""
+    setEnv "Path" newPath
  cp <- createProcessWithMingwPath ((proc exe args) { cwd = chdir, env = env })
  exit_code <- liftIO $ withCreateProcess cp $ \_ _ _ p -> waitForProcess p
  pure $ toProcessError exe args exit_code