@@ -33,7 +33,7 @@ infixl 0 |>
3333
3434data CommandError
3535 = MissingExe
36− | CommandFailed String
36+ | CommandFailed (String, String)
3737
3838
3939{-| Run a command, throw an error if the command is not found or if something
@@ -52,7 +52,8 @@ run command args =
5252
5353 message err =
5454 case err of
55− CommandFailed msg -> msg
55+ CommandFailed (stderr, stdout) ->
56+ stdout ++ stderr
5657 MissingExe ->
5758 "Could not find command '" ++ command ++ "'. Do you have it installed?\n\
5859 \ Can it be run from anywhere? Is it on your PATH?"
@@ -67,7 +68,7 @@ unwrappedRun command args =
6768 ExitFailure code
6869 | code == 127 -> Left MissingExe -- UNIX
6970 | code == 9009 -> Left MissingExe -- Windows
70− | otherwise -> Left (CommandFailed stderr)
71+ | otherwise -> Left (CommandFailed (stdout, stderr))
7172
7273
7374-- GET STATIC ASSETS