Merge pull request #2917 from unisonweb/topic/cp65001

switch to Windows code page 65001 in exe:unison and exe:tests
unisonweb · Feb 18, 2022 · 1a92f2a · 1a92f2a
2 parents 9eeb98f + 87e58af
commit 1a92f2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/unison-cli/package.yaml b/unison-cli/package.yaml
@@ -51,6 +51,7 @@ library:
 tests:
   tests:
     dependencies:
+      - code-page
       - easytest
       - here
       - shellmet
@@ -65,6 +66,7 @@ executables:
     main: Main.hs
     ghc-options: -threaded -rtsopts -with-rtsopts=-I0 -optP-Wno-nonportable-include-path
     dependencies:
+      - code-page
       - optparse-applicative >= 0.16.1.0
       - shellmet
       - template-haskell

diff --git a/unison-cli/tests/Main.hs b/unison-cli/tests/Main.hs
@@ -3,6 +3,7 @@ module Main where
 import EasyTest
 import System.Environment (getArgs)
 import System.IO
+import System.IO.CodePage (withCP65001)
 import qualified Unison.Test.ClearCache as ClearCache
 import qualified Unison.Test.CommandLine as CommandLine
 import qualified Unison.Test.GitSync as GitSync
@@ -20,7 +21,7 @@ test =
     ]
 
 main :: IO ()
-main = do
+main = withCP65001 do
   args <- getArgs
   mapM_ (`hSetEncoding` utf8) [stdout, stdin, stderr]
   case args of

diff --git a/unison-cli/unison-cli.cabal b/unison-cli/unison-cli.cabal
@@ -298,6 +298,7 @@ executable unison
     , async
     , base
     , bytestring
+    , code-page
     , configurator
     , containers >=0.6.3
     , cryptonite
@@ -376,6 +377,7 @@ test-suite tests
     , async
     , base
     , bytestring
+    , code-page
     , configurator
     , containers >=0.6.3
     , cryptonite

diff --git a/unison-cli/unison/Main.hs b/unison-cli/unison/Main.hs
@@ -20,6 +20,7 @@ import System.Directory (canonicalizePath, getCurrentDirectory, removeDirectoryR
 import System.Environment (getProgName, withArgs)
 import qualified System.Exit as Exit
 import qualified System.FilePath as FP
+import System.IO.CodePage (withCP65001)
 import System.IO.Error (catchIOError)
 import qualified System.IO.Temp as Temp
 import qualified System.Path as Path
@@ -67,7 +68,7 @@ import qualified Data.List.NonEmpty as NonEmpty
 import Unison.CommandLine.Welcome (CodebaseInitStatus(..))
 
 main :: IO ()
-main = do
+main = withCP65001 do
  interruptHandler <- defaultInterruptHandler
  withInterruptHandler interruptHandler $ do
   progName <- getProgName