haskell-nix/hnix-store
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix-store.git synced 2024-07-14 21:20:32 +03:00
Code Issues Projects Releases Wiki Activity

Set executable permissions once instead of multiple times

Browse Source
This commit is contained in:
Vaibhav Sagar 2023-11-26 15:42:52 +11:00
parent 48b4891693
commit 408cf093ea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hnix-store-nar/src/System/Nix/Nar/Effects.hs
View File

@ -88,7 +88,7 @@ streamStringOutIO
streamStringOutIO f executable getChunk =
Exception.Lifted.bracket
(liftIO $ IO.openFile f WriteMode)
(liftIO . IO.hClose)
(\h -> liftIO (updateExecutablePermissions >> IO.hClose h))
go
`Exception.Lifted.catch`
cleanupException
@ -100,10 +100,11 @@ streamStringOutIO f executable getChunk =
Nothing -> pure ()
Just c -> do
liftIO $ Data.ByteString.hPut handle c
Control.Monad.when (executable == Executable) $ liftIO $ do
p <- Directory.getPermissions f
Directory.setPermissions f (p { Directory.executable = True })
go handle
updateExecutablePermissions =
Control.Monad.when (executable == Executable) $ do
p <- Directory.getPermissions f
Directory.setPermissions f (p { Directory.executable = True })
cleanupException (e :: Exception.Lifted.SomeException) = do
liftIO $ Directory.removeFile f
Control.Monad.fail $