summaryrefslogtreecommitdiff
path: root/src/Propellor/Message.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 01:01:50 -0400
committerJoey Hess2014-11-18 01:01:50 -0400
commit40f6d06f1a65b3a12adb853ab924e1181b0855b2 (patch)
tree2cc6e4c0460659f92b8e91267ea4583522b52b77 /src/Propellor/Message.hs
parent973025723c0d267c3f65362c5fa640a857b50d62 (diff)
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.
Diffstat (limited to 'src/Propellor/Message.hs')
-rw-r--r--src/Propellor/Message.hs8
1 files changed, 1 insertions, 7 deletions
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 ()