Revert to e08963c7

ihaskell.cabal

@@ -79,7 +79,7 @@ library
                        parsec               -any,
                        process              >=1.1,
                        random               >=1.0,
-                       shelly               >=1.4,
+                       shelly               >=1.3,
                        split                >= 0.2,
                        strict               >=0.3,
                        system-argv0         -any,

notebooks/Test.ipynb

@@ -18,7 +18,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 1
+     "prompt_number": 12
     },
     {
      "cell_type": "code",
@@ -30,7 +30,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 2
+     "prompt_number": 13
     },
     {
      "cell_type": "code",
@@ -41,19 +41,8 @@
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "html": [
-        "<span class='err-msg'>Ambiguous interface for `Control.Monad.Identity': it was found in multiple packages: monads-tf-0.1.0.1 mtl-2.1.2</span>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "Ambiguous interface for `Control.Monad.Identity': it was found in multiple packages: monads-tf-0.1.0.1 mtl-2.1.2"
-       ]
-      }
-     ],
-     "prompt_number": 3
+     "outputs": [],
+     "prompt_number": 14
     },
     {
      "cell_type": "code",
@@ -69,7 +58,7 @@
        "output_type": "display_data"
       }
      ],
-     "prompt_number": 3
+     "prompt_number": 1
     },
     {
      "cell_type": "code",

src/IHaskell/IPython.hs

@@ -55,9 +55,15 @@ ipython which suppress args = do
   runCmd <- liftIO $ Paths.getDataFileName "installation/run.sh"
   venv <- fpToText <$> ipythonDir
   let cmdArgs = [pack runCmd, venv] ++ args
-  unpack <$> if suppress
-             then silently $ run "bash" cmdArgs
-             else run "bash" cmdArgs
+  runHandles "bash" cmdArgs handles doNothing
+  where handles = [InHandle Inherit, outHandle suppress, errorHandle suppress]
+        outHandle True = OutHandle CreatePipe
+        outHandle False = OutHandle Inherit
+        errorHandle True =  ErrorHandle CreatePipe
+        errorHandle False = ErrorHandle Inherit
+        doNothing _ stdout _ = if suppress 
+                                then liftIO $ StrictIO.hGetContents stdout
+                                else return ""
 
 -- | Run while suppressing all output.
 quietRun path args = runHandles path args handles nothing