summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2016-12-24 15:14:05 -0400
committerJoey Hess2016-12-24 15:14:05 -0400
commit44bf67b7a2da75ef80e32d6409cc41a6ab8b6ffe (patch)
treed955382901fd4ea2bec6412d5b652d9ac7ecbe23 /src/wrapper.hs
parentfa974cfaaac31b25ae911b5e970507d0589e567b (diff)
GHC's fileSystemEncoding is used for all String IO, to avoid encoding-related crashes in eg, Propellor.Property.File.
Diffstat (limited to 'src/wrapper.hs')
-rw-r--r--src/wrapper.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 06051500..20b4d8c6 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -20,6 +20,7 @@ import Utility.Directory
import Utility.FileMode
import Utility.Process
import Utility.Process.NonConcurrent
+import Utility.FileSystemEncoding
import System.Environment (getArgs)
import System.Exit
@@ -30,7 +31,9 @@ import Control.Applicative
import Prelude
main :: IO ()
-main = withConcurrentOutput $ go =<< getArgs
+main = withConcurrentOutput $ do
+ useFileSystemEncoding
+ go =<< getArgs
where
go ["--init"] = interactiveInit
go args = ifM configInCurrentWorkingDirectory