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

'debug' shouldn't fail if 'cabal' is not installed

Browse Source 
which seems to be more common that you'd think
This commit is contained in:
Daniel Gröber 2016-05-11 15:27:11 +02:00
parent 3ae9204b95
commit 7e05c15219
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Language/Haskell/GhcMod/Debug.hs
View File

@ -9,6 +9,7 @@ import qualified Data.Set as Set
import Data.Char import Data.Char
import Data.Version import Data.Version
import Data.List.Split import Data.List.Split
import System.Directory
import Text.PrettyPrint import Text.PrettyPrint
import Language.Haskell.GhcMod.Monad import Language.Haskell.GhcMod.Monad
import Language.Haskell.GhcMod.Types import Language.Haskell.GhcMod.Types
@ -76,8 +77,14 @@ cabalDebug = do
srcOpts = Map.map gmcGhcSrcOpts mcs srcOpts = Map.map gmcGhcSrcOpts mcs
readProc <- gmReadProcess readProc <- gmReadProcess
cabalInstVersion <- liftIO $ cabalExists <- liftIO $ (/=Nothing) <$> findExecutable "cabal"
dropWhileEnd isSpace <$> readProc "cabal" ["--numeric-version"] ""
cabalInstVersion <-
if cabalExists
then liftIO $
dropWhileEnd isSpace <$> readProc "cabal" ["--numeric-version"] ""
else return ""
packages <- liftIO $ readProc "ghc-pkg" ["list", "--simple-output"] "" packages <- liftIO $ readProc "ghc-pkg" ["list", "--simple-output"] ""
let cabalPackages = filter ((== ["Cabal"]) . take 1 . splitOn "-") $ splitWhen isSpace packages let cabalPackages = filter ((== ["Cabal"]) . take 1 . splitOn "-") $ splitWhen isSpace packages