hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix newTempDir on Windows

Browse Source
This commit is contained in:
Daniel Gröber 2014-10-31 10:34:07 +01:00
parent ff75811a76
commit 1797a53800
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Language/Haskell/GhcMod/Cradle.hs
View File

@ -14,7 +14,7 @@ import Control.Exception.IOChoice ((||>))
import Control.Monad (filterM) import Control.Monad (filterM)
import Data.List (isSuffixOf) import Data.List (isSuffixOf)
import System.Directory (getCurrentDirectory, getDirectoryContents, doesFileExist, getTemporaryDirectory, removeDirectoryRecursive) import System.Directory (getCurrentDirectory, getDirectoryContents, doesFileExist, getTemporaryDirectory, removeDirectoryRecursive)
import System.FilePath ((</>), takeDirectory) import System.FilePath ((</>),takeDirectory,pathSeparators,splitDrive)
import System.IO.Temp import System.IO.Temp
@ -34,8 +34,9 @@ newTempDir :: FilePath -> IO FilePath
newTempDir dir = newTempDir dir =
flip createTempDirectory uniqPathName =<< getTemporaryDirectory flip createTempDirectory uniqPathName =<< getTemporaryDirectory
where where
uniqPathName = "ghc-mod" ++ map escapeSlash dir uniqPathName = "ghc-mod" ++ map escapeSlash (snd $ splitDrive dir)
escapeSlash '/' = '-'
escapeSlash c | c `elem` pathSeparators = '-'
escapeSlash c = c escapeSlash c = c
cleanupCradle :: Cradle -> IO () cleanupCradle :: Cradle -> IO ()