aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-06-23 12:36:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-06-23 12:36:28 -0400
commit24ff5f59cfbd60cdedb597151679a36ac43bd8b2 (patch)
treef1d277c20f04985053104e6aac6c15944e427f91
parentb3be19d0726c2807b1e4d01eb2f3b12623e24cb4 (diff)
parentae79041846c0810d7bf8e12241b365665d8744bc (diff)
-rw-r--r--Remote/Bup.hs5
1 files changed, 4 insertions, 1 deletions
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