Commit 96ce9501 authored by Andrew Gibiansky's avatar Andrew Gibiansky

Formatting

parent cab4cfdf
...@@ -131,7 +131,8 @@ verifyIPythonVersion = do ...@@ -131,7 +131,8 @@ verifyIPythonVersion = do
pathMay <- SH.which "jupyter" pathMay <- SH.which "jupyter"
pathMay' <- SH.which "ipython" pathMay' <- SH.which "ipython"
case (pathMay, pathMay') of case (pathMay, pathMay') of
(Nothing, Nothing) -> badIPython "No Jupyter detected -- install Jupyter 3.0+ before using IHaskell." (Nothing, Nothing) -> badIPython
"No Jupyter detected -- install Jupyter 3.0+ before using IHaskell."
(Just path, _) -> do (Just path, _) -> do
SH.silently (SH.run path ["--version"]) SH.silently (SH.run path ["--version"])
output <- T.unpack <$> SH.lastStderr output <- T.unpack <$> SH.lastStderr
...@@ -145,8 +146,10 @@ verifyIPythonVersion = do ...@@ -145,8 +146,10 @@ verifyIPythonVersion = do
(_, 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
Just (x:_) -> if x >= 3 then return () else oldIPython Just (x:_) -> if x >= 3
_ -> badIPython "Detected Jupyter, but could not parse version number." then return ()
else oldIPython
_ -> badIPython "Detected IPython, but could not parse version number."
where where
badIPython :: Text -> SH.Sh () badIPython :: Text -> SH.Sh ()
......
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