From 40f6d06f1a65b3a12adb853ab924e1181b0855b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 01:01:50 -0400 Subject: Run remote propellor --spin with a controlling terminal. Avoids need for hack to make ansi colors work, but also things like apt-get and wget process bars will be displayed. --- src/Propellor/Message.hs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/Propellor/Message.hs') diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs index 3671e05b..e184a59e 100644 --- a/src/Propellor/Message.hs +++ b/src/Propellor/Message.hs @@ -6,26 +6,20 @@ import System.Console.ANSI import System.IO import System.Log.Logger import "mtl" Control.Monad.Reader -import Control.Applicative -import Data.Maybe import Propellor.Types import Utility.Monad -import Utility.Env data MessageHandle = ConsoleMessageHandle | TextMessageHandle mkMessageHandle :: IO MessageHandle -mkMessageHandle = ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "TERM")) +mkMessageHandle = ifM (hIsTerminalDevice stdout) ( return ConsoleMessageHandle , return TextMessageHandle ) -forceConsoleMode :: IO () -forceConsoleMode = void $ setEnv "TERM" "vt100" False - whenConsole :: MessageHandle -> IO () -> IO () whenConsole ConsoleMessageHandle a = a whenConsole _ _ = return () -- cgit v1.3-2-g0d8e