From 20cb042e02c55ada4ce1fcb220accdda0947d24e Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Fri, 29 Mar 2019 18:47:53 +1000 Subject: [PATCH] ifc: re-export shell from Purebred.System.Process Re-export 'shell' from Purebred.System.Process so that we can avoid directly importing System.Process.Typed anywhere (except the aforementioned module). We want to avoid using typed-process directly; instead we want to ensure we use our own variants that taint the process output. Part of: https://github.com/purebred-mua/purebred/issues/269 --- src/Purebred/System/Process.hs | 1 + src/UI/Actions.hs | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Purebred/System/Process.hs b/src/Purebred/System/Process.hs index f673241f..8c95c2ce 100644 --- a/src/Purebred/System/Process.hs +++ b/src/Purebred/System/Process.hs @@ -23,6 +23,7 @@ module Purebred.System.Process -- * Re-exports from @System.Process.Typed@ , ProcessConfig , proc + , shell , setStdin , byteStringInput ) where diff --git a/src/UI/Actions.hs b/src/UI/Actions.hs index cd4aafeb..c4420cca 100644 --- a/src/UI/Actions.hs +++ b/src/UI/Actions.hs @@ -88,7 +88,6 @@ import System.IO (hFlush) import GHC.IO.Handle (Handle) import System.IO.Temp (withSystemTempFile, emptyTempFile) import System.Directory (getTemporaryDirectory, removeFile) -import System.Process.Typed (shell, proc, setStdin, byteStringInput) import System.FilePath (takeDirectory, ()) import qualified Data.Vector as Vector import Prelude hiding (readFile, unlines) @@ -127,7 +126,7 @@ import UI.Views import Purebred.LazyVector (V) import Purebred.Tags (parseTagOps) import Purebred.System.Directory (listDirectory') -import Purebred.System.Process (tryRunProcess, handleIOException, handleExitCode) +import Purebred.System.Process class Scrollable (n :: Name) where makeViewportScroller :: Proxy n -> Brick.ViewportScroll Name