summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2016-12-26 12:08:02 -0400
committerJoey Hess2016-12-26 12:09:38 -0400
commit5605c9665e57b22c7415691984f31f75b3337cd9 (patch)
tree8f5790d1bb4dab6220e21449caf6ed1d5f802405 /src/wrapper.hs
parent1d868470e4ec6ec6211206003279ac4bc8465c4f (diff)
parent44bf67b7a2da75ef80e32d6409cc41a6ab8b6ffe (diff)
Merge branch 'joeyconfig'
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