execute remote.<name>.annex-shell on remote, if set
It is useful to be able to specify an alternative git-annex-shell program to execute on the remote, e.g., to run a version not on the PATH. Use remote.<name>.annex-shell if specified, instead of the default "git-annex-shell" i.e., first so-named executable on the PATH.
This commit is contained in:
parent
5ed51e724e
commit
4eb72392b4
5 changed files with 26 additions and 9 deletions
|
@ -26,10 +26,8 @@ import Config
|
|||
{- Generates parameters to ssh to a repository's host and run a command.
|
||||
- Caller is responsible for doing any neccessary shellEscaping of the
|
||||
- passed command. -}
|
||||
toRepo :: Git.Repo -> [CommandParam] -> Annex [CommandParam]
|
||||
toRepo r sshcmd = do
|
||||
g <- fromRepo id
|
||||
let c = extractRemoteGitConfig g (Git.repoDescribe r)
|
||||
toRepo :: Git.Repo -> RemoteGitConfig -> [CommandParam] -> Annex [CommandParam]
|
||||
toRepo r c sshcmd = do
|
||||
let opts = map Param $ remoteAnnexSshOptions c
|
||||
let host = fromMaybe (error "bad ssh url") $ Git.Url.hostuser r
|
||||
params <- sshCachingOptions (host, Git.Url.port r) opts
|
||||
|
@ -41,16 +39,19 @@ git_annex_shell :: Git.Repo -> String -> [CommandParam] -> [(Field, String)] ->
|
|||
git_annex_shell r command params fields
|
||||
| not $ Git.repoIsUrl r = return $ Just (shellcmd, shellopts ++ fieldopts)
|
||||
| Git.repoIsSsh r = do
|
||||
g <- fromRepo id
|
||||
let c = extractRemoteGitConfig g (Git.repoDescribe r)
|
||||
u <- getRepoUUID r
|
||||
sshparams <- toRepo r [Param $ sshcmd u ]
|
||||
sshparams <- toRepo r c [Param $ sshcmd u c]
|
||||
return $ Just ("ssh", sshparams)
|
||||
| otherwise = return Nothing
|
||||
where
|
||||
dir = Git.repoPath r
|
||||
shellcmd = "git-annex-shell"
|
||||
shellopts = Param command : File dir : params
|
||||
sshcmd u = unwords $
|
||||
shellcmd : map shellEscape (toCommand shellopts) ++
|
||||
sshcmd u c = unwords $
|
||||
fromMaybe shellcmd (remoteAnnexShell c)
|
||||
: map shellEscape (toCommand shellopts) ++
|
||||
uuidcheck u ++
|
||||
map shellEscape (toCommand fieldopts)
|
||||
uuidcheck NoUUID = []
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue