diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-01 13:52:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-01 13:58:14 -0400 |
| commit | 18a3a186e9cdb69ee503d961d8285a341d818c48 (patch) | |
| tree | d415a97f6c65e2268c948c6c2425d1b94b16df92 /Remote/Helper/Hooks.hs | |
| parent | b6e3e7516dfdc054b9e1a281b2e49b392d235ee2 (diff) | |
type based git config handling for remotes
Still a couple of places that use git config ad-hoc, but this is most of it
done.
Diffstat (limited to 'Remote/Helper/Hooks.hs')
| -rw-r--r-- | Remote/Helper/Hooks.hs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs index 91190d841..bdeb653eb 100644 --- a/Remote/Helper/Hooks.hs +++ b/Remote/Helper/Hooks.hs @@ -13,15 +13,16 @@ import Common.Annex import Types.Remote import qualified Annex import Annex.LockPool -import Config import Annex.Perms {- Modifies a remote's access functions to first run the - annex-start-command hook, and trigger annex-stop-command on shutdown. - This way, the hooks are only run when a remote is actively being used. -} -addHooks :: Remote -> Annex Remote -addHooks r = addHooks' r <$> lookupHook r "start" <*> lookupHook r "stop" +addHooks :: Remote -> Remote +addHooks r = addHooks' r + (remoteAnnexStartCommand $ gitconfig r) + (remoteAnnexStopCommand $ gitconfig r) addHooks' :: Remote -> Maybe String -> Maybe String -> Remote addHooks' r Nothing Nothing = r addHooks' r starthook stophook = r' @@ -83,10 +84,3 @@ runHooks r starthook stophook a = do Left _ -> noop Right _ -> run stophook liftIO $ closeFd fd - -lookupHook :: Remote -> String -> Annex (Maybe String) -lookupHook r n = go =<< getRemoteConfig (repo r) hookname "" - where - go "" = return Nothing - go command = return $ Just command - hookname = n ++ "-command" |