haskell/haskell-ide-engine
1
1
Fork 0
mirror of https://github.com/haskell/haskell-ide-engine.git synced 2024-09-11 11:05:30 +03:00
Code Issues Projects Releases Wiki Activity

Take in account local cache dir

Browse Source
This commit is contained in:
jneira 2019-10-11 06:36:35 +02:00
parent da3f7771a9
commit d1e442b608
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install/src/Stack.hs
View File

@ -6,7 +6,7 @@ import Development.Shake.FilePath
import Control.Monad
import Data.List
import System.Directory ( copyFile )
import System.FilePath ( searchPathSeparator )
import System.FilePath ( searchPathSeparator, (</>) )
import System.Environment ( lookupEnv, setEnv, getEnvironment )
import BuildSystem
import Version
@ -108,22 +108,24 @@ withOriginalPath action = do
(Just paths, True) -> do
snapshotDir <- trimmedStdout <$> execStackShake ["path", "--snapshot-install-root"]
let origPaths = removePathsContaining snapshotDir paths
localInstallDir <- trimmedStdout <$> execStackShake ["path", "--local-install-dir"]
let cacheBinPaths = [snapshotDir </> "bin", localInstallDir </> "bin"]
let origPaths = removePathsContaining cacheBinPaths paths
liftIO (setEnv "PATH" origPaths)
a <- action
liftIO (setEnv "PATH" paths)
return a
otherwise -> action
where removePathsContaining str path =
joinPaths (filter (not.(isInfixOf str)) (splitPaths path))
where removePathsContaining strs path =
joinPaths (filter (not . containsAny) (splitPaths path))
where containsAny p = any (`isInfixOf` p) strs
joinPaths = intercalate [searchPathSeparator]
splitPaths s =
case dropWhile (== searchPathSeparator) s of
"" -> []