haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-28 23:20:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deal with case-insensitive environment variables on Windows #94

Browse Source
This commit is contained in:
Michael Snoyman 2013-07-30 20:44:43 -07:00
parent 976c6acb8b
commit 38fc80cb32
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Stackage/Util.hs
View File

@ -4,7 +4,7 @@ module Stackage.Util where
import qualified Codec.Archive.Tar as Tar import qualified Codec.Archive.Tar as Tar
import qualified Codec.Archive.Tar.Entry as TarEntry import qualified Codec.Archive.Tar.Entry as TarEntry
import Control.Monad (guard, when) import Control.Monad (guard, when)
import Data.Char (isSpace) import Data.Char (isSpace, toUpper)
import Data.List (stripPrefix) import Data.List (stripPrefix)
import qualified Data.Map as Map import qualified Data.Map as Map
import Data.Maybe (mapMaybe) import Data.Maybe (mapMaybe)
@ -128,8 +128,10 @@ getModifiedEnv settings = do
fmap (map $ fixEnv $ binDir settings) getEnvironment fmap (map $ fixEnv $ binDir settings) getEnvironment
where where
fixEnv :: FilePath -> (String, String) -> (String, String) fixEnv :: FilePath -> (String, String) -> (String, String)
fixEnv bin (p@"PATH", x) = (p, bin ++ pathSep : x) fixEnv bin (p, x)
fixEnv _ x = x -- Thank you Windows having case-insensitive environment variables...
| map toUpper p == "PATH" = (p, bin ++ pathSep : x)
| otherwise = (p, x)
-- | Separate for the PATH environment variable -- | Separate for the PATH environment variable
pathSep :: Char pathSep :: Char