more RawFilePath conversion

580/645

This commit was sponsored by Jack Hill on Patreon.
This commit is contained in:
Joey Hess 2020-11-03 18:34:27 -04:00
parent eb42cd4d46
commit 4bcb4030a5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
10 changed files with 61 additions and 50 deletions

View file

@ -51,7 +51,8 @@ ensureInstalled = ifM (isJust <$> getEnv "GIT_ANNEX_PACKAGE_INSTALL")
go (Just base) = do
let program = base </> "git-annex"
programfile <- programFile
createDirectoryIfMissing True (parentDir programfile)
createDirectoryIfMissing True $
fromRawFilePath (parentDir (toRawFilePath programfile))
writeFile programfile program
#ifdef darwin_HOST_OS
@ -100,7 +101,7 @@ installWrapper :: FilePath -> String -> IO ()
installWrapper file content = do
curr <- catchDefaultIO "" $ readFileStrict file
when (curr /= content) $ do
createDirectoryIfMissing True (parentDir file)
createDirectoryIfMissing True (fromRawFilePath (parentDir (toRawFilePath file)))
viaTmp writeFile file content
modifyFileMode file $ addModes [ownerExecuteMode]

View file

@ -46,7 +46,9 @@ makeRepo path bare = ifM (probeRepoExists path)
{- Runs an action in the git repository in the specified directory. -}
inDir :: FilePath -> Annex a -> IO a
inDir dir a = do
state <- Annex.new =<< Git.Config.read =<< Git.Construct.fromPath dir
state <- Annex.new
=<< Git.Config.read
=<< Git.Construct.fromPath (toRawFilePath dir)
Annex.eval state $ a `finally` stopCoProcesses
{- Creates a new repository, and returns its UUID. -}

View file

@ -335,7 +335,8 @@ addLink file link mk = do
Just (currlink, sha, _type)
| s2w8 link == L.unpack currlink ->
stageSymlink (toRawFilePath file) sha
_ -> stageSymlink (toRawFilePath file) =<< hashSymlink link
_ -> stageSymlink (toRawFilePath file)
=<< hashSymlink (toRawFilePath link)
madeChange file $ LinkChange mk
onDel :: Handler

View file

@ -118,5 +118,6 @@ postPreferencesR = page "Preferences" (Just Configuration) $ do
inAutoStartFile :: Annex Bool
inAutoStartFile = do
here <- liftIO . absPath . fromRawFilePath =<< fromRepo Git.repoPath
any (`equalFilePath` here) <$> liftIO readAutoStartFile
here <- liftIO . absPath =<< fromRepo Git.repoPath
any (`equalFilePath` here) . toRawFilePath
<$> liftIO readAutoStartFile