diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-13 14:30:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-13 14:30:04 -0400 |
| commit | 86a2e79338c13108e100859a942883690ad286f3 (patch) | |
| tree | 375323fc282638ae62b8b8a0b8834b6dbdf92d18 /Assistant/Ssh.hs | |
| parent | 9aadec552b0590fbed10ed9e1d74540bbaf5fb7f (diff) | |
deal with Android's nonstandard shell location
This is so gratutious and pointless. It's a shame that everything we
learned about Unix portability and the importance of standards has been
thrown out the window by these guys.
Diffstat (limited to 'Assistant/Ssh.hs')
| -rw-r--r-- | Assistant/Ssh.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 15c97ab53..753babad4 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -10,6 +10,7 @@ module Assistant.Ssh where import Common.Annex import Utility.TempFile import Utility.UserInfo +import Utility.Shell import Git.Remote import Data.Text (Text) @@ -155,7 +156,7 @@ addAuthorizedKeysCommand rsynconly dir pubkey = join "&&" echoval v = "echo " ++ shellEscape v wrapper = "~/.ssh/git-annex-shell" script = - [ "#!/bin/sh" + [ shebang , "set -e" , "exec git-annex-shell -c \"$SSH_ORIGINAL_COMMAND\"" ] |