From c5fe457e0158420ed7771069e79b72adf7d057b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Jan 2025 14:42:27 -0400 Subject: [PATCH] fix reversion 793ddecd4b72a5e4746b3b426d3bca400737118b made installWrapper not do newline conversion on windows. --- Assistant/Install.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Assistant/Install.hs b/Assistant/Install.hs index da33b16842..94a40369cc 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -17,7 +17,6 @@ import Utility.Shell import Utility.Tmp import Utility.Env import Utility.SshConfig -import qualified Utility.FileIO as F #ifdef darwin_HOST_OS import Utility.OSX @@ -105,7 +104,7 @@ installWrapper file content = do curr <- catchDefaultIO "" $ readFileStrict (fromRawFilePath file) when (curr /= content) $ do createDirectoryIfMissing True (fromRawFilePath (parentDir file)) - viaTmp F.writeFile' (toOsPath file) (encodeBS content) + viaTmp (writeFile . fromRawFilePath . fromOsPath) (toOsPath file) content modifyFileMode file $ addModes [ownerExecuteMode] installFileManagerHooks :: FilePath -> IO ()