git.iko.soy/elk
on master help sign in
cosmetic: use nicer indentation and if style
50d4efbEvan Czaplicki
src/Elm/Utils.hs+16−6
compare with master
unifiedsplit
@@ -59,7 +59,9 @@ run :: (MonadError String m, MonadIO m) => String -> [String] -> m String
59run command args =
59run command args =
60 do result <- liftIO (unwrappedRun command args)
60 do result <- liftIO (unwrappedRun command args)
61 case result of
61 case result of
62+ Right out ->
62− Right out -> return out
63+ return out
64+
63 Left err ->
65 Left err ->
64 throwError (context (message err))
66 throwError (context (message err))
65 where
67 where
@@ -70,6 +72,7 @@ run command args =
70 case err of
72 case err of
71 CommandFailed stderr stdout ->
73 CommandFailed stderr stdout ->
72 stdout ++ stderr
74 stdout ++ stderr
75+
73 MissingExe msg ->
76 MissingExe msg ->
74 msg
77 msg
75
78
@@ -79,11 +82,18 @@ unwrappedRun command args =
79 do (exitCode, stdout, stderr) <- readProcessWithExitCode command args ""
82 do (exitCode, stdout, stderr) <- readProcessWithExitCode command args ""
80 return $
83 return $
81 case exitCode of
84 case exitCode of
82− ExitSuccess -> Right stdout
85+ ExitSuccess ->
86+ Right stdout
87+
83− ExitFailure code
88+ ExitFailure code ->
89+ if code == 127 then
84− | code == 127 -> Left (missingExe command) -- UNIX
90+ Left (missingExe command) -- UNIX
91+
92+ else if code == 9009 then
85− | code == 9009 -> Left (missingExe command) -- Windows
93+ Left (missingExe command) -- Windows
94+
95+ else
86− | otherwise -> Left (CommandFailed stdout stderr)
96+ Left (CommandFailed stdout stderr)
87
97
88
98
89missingExe :: String -> CommandError
99missingExe :: String -> CommandError