mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Avoid creating ~/.bup when initializing a bup remote

Browse source
This commit is contained in:
Lauri Alanko 2012-01-20 06:26:04 +02:00 • committed by Joey Hess
parent 9b51ec9dbf
commit 6da40100c9
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Remote/Bup.hs
View file

@ -11,6 +11,8 @@ import qualified Data.ByteString.Lazy.Char8 as L
import System.IO.Error import System.IO.Error
import qualified Data.Map as M import qualified Data.Map as M
import System.Process import System.Process
import System.Posix.Env (getEnvironment)
import System.Path (brackettmpdir)
import Common.Annex import Common.Annex
import Types.Remote import Types.Remote
@ -83,10 +85,21 @@ bupParams :: String -> BupRepo -> [CommandParam] -> [CommandParam]
bupParams command buprepo params = bupParams command buprepo params =
Param command : [Param "-r", Param buprepo] ++ params Param command : [Param "-r", Param buprepo] ++ params
isLocal :: BupRepo -> Bool
isLocal buprepo = not (elem ':' buprepo)
bup :: String -> BupRepo -> [CommandParam] -> Annex Bool bup :: String -> BupRepo -> [CommandParam] -> Annex Bool
bup command buprepo params = do bup command buprepo params = do
showOutput -- make way for bup output showOutput -- make way for bup output
liftIO $ boolSystem "bup" $ bupParams command buprepo params liftIO action
where
action | isLocal buprepo = runBup lparams buprepo
| otherwise = brackettmpdir "bupXXXXXX" $ runBup rparams
lparams = Param command : params
rparams = bupParams command buprepo params
runBup params bupdir = do
env <- getEnvironment
boolSystemEnv "bup" params (Just (("BUP_DIR", bupdir) : env))
pipeBup :: [CommandParam] -> Maybe Handle -> Maybe Handle -> IO Bool pipeBup :: [CommandParam] -> Maybe Handle -> Maybe Handle -> IO Bool
pipeBup params inh outh = do pipeBup params inh outh = do