From ae79041846c0810d7bf8e12241b365665d8744bc Mon Sep 17 00:00:00 2001 From: Oliver Matthews Date: Fri, 21 Jun 2013 09:28:43 +0100 Subject: Strip leading /~/ from bup relatively pathed bup remotes --- Remote/Bup.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Remote') diff --git a/Remote/Bup.hs b/Remote/Bup.hs index f5c802e09..9b3675cfa 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -217,10 +217,13 @@ storeBupUUID u buprepo = do onBupRemote :: Git.Repo -> (FilePath -> [CommandParam] -> IO a) -> FilePath -> [CommandParam] -> Annex a onBupRemote r a command params = do - let dir = shellEscape (Git.repoPath r) sshparams <- sshToRepo r [Param $ "cd " ++ dir ++ " && " ++ unwords (command : toCommand params)] liftIO $ a "ssh" sshparams + where + path = Git.repoPath r + base = fromMaybe path (stripPrefix "/~/" path) + dir = shellEscape base {- Allow for bup repositories on removable media by checking - local bup repositories to see if they are available, and getting their -- cgit v1.2.3