Commit 35e469d1 authored by Andrew Gibiansky's avatar Andrew Gibiansky

Formatting

parent 96ce9501
...@@ -134,15 +134,23 @@ verifyIPythonVersion = do ...@@ -134,15 +134,23 @@ verifyIPythonVersion = do
(Nothing, Nothing) -> badIPython (Nothing, Nothing) -> badIPython
"No Jupyter detected -- install Jupyter 3.0+ before using IHaskell." "No Jupyter detected -- install Jupyter 3.0+ before using IHaskell."
(Just path, _) -> do (Just path, _) -> do
SH.silently (SH.run path ["--version"]) stdout <- SH.silently (SH.run path ["--version"])
output <- T.unpack <$> SH.lastStderr stderr <- SH.lastStderr
case parseVersion output of case parseVersion $ T.unpack stderr of
Just (4:_) -> return () Just (4:_) -> return ()
Just (3:_) -> return () Just (3:_) -> return ()
Just (2:_) -> oldIPython Just (2:_) -> oldIPython
Just (1:_) -> oldIPython Just (1:_) -> oldIPython
Just (0:_) -> oldIPython Just (0:_) -> oldIPython
_ -> badIPython "Detected Jupyter, but could not parse version number." _ -> badIPython $ T.concat
[ "Detected Jupyter, but could not parse version number."
, "\n"
, "(stdout = "
, stdout
, ", stderr = "
, stderr
, ")"
]
(_, Just path) -> do (_, Just path) -> do
output <- T.unpack <$> SH.silently (SH.run path ["--version"]) output <- T.unpack <$> SH.silently (SH.run path ["--version"])
case parseVersion output of case parseVersion output of
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment