From d130e7e628568be9593474fbe5601239c6ce8a2e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Nov 2014 21:48:48 -0400 Subject: propellor spin --- src/Propellor/Message.hs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/Propellor/Message.hs') diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs index a5d4d2ca..244913ea 100644 --- a/src/Propellor/Message.hs +++ b/src/Propellor/Message.hs @@ -15,16 +15,19 @@ import Control.Applicative import Propellor.Types import Utility.Monad import Utility.Env +import Utility.FileSystemEncoding data MessageHandle = ConsoleMessageHandle | TextMessageHandle mkMessageHandle :: IO MessageHandle -mkMessageHandle = ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "PROPELLOR_CONSOLE")) - ( return ConsoleMessageHandle - , return TextMessageHandle - ) +mkMessageHandle = do + fileEncoding stdout + ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "PROPELLOR_CONSOLE")) + ( return ConsoleMessageHandle + , return TextMessageHandle + ) forceConsole :: IO () forceConsole = void $ setEnv "PROPELLOR_CONSOLE" "1" True -- cgit v1.3-2-g0d8e