diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-06 15:58:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-06 15:58:13 -0400 |
| commit | ae8912003022be1a8cd77684824a89460c7ff646 (patch) | |
| tree | c79f54fe1654349312fc95dc4684300a63784bc6 /Assistant | |
| parent | 7df05f6417794713d8c1a7c051f5723cba543542 (diff) | |
fix use of wrong shebang when android is installing git-annex-shell wrapper on server
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Install.hs | 2 | ||||
| -rw-r--r-- | Assistant/Ssh.hs | 2 | ||||
| -rw-r--r-- | Assistant/XMPP/Git.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index ac1af0135..278190b35 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -63,7 +63,7 @@ ensureInstalled = go =<< standaloneAppBase let runshell var = "exec " ++ base </> "runshell" ++ " git-annex-shell -c \"" ++ var ++ "\"" let content = unlines - [ shebang + [ shebang_local , "set -e" , "if [ \"x$SSH_ORIGINAL_COMMAND\" != \"x\" ]; then" , runshell "$SSH_ORIGINAL_COMMAND" diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index c7543d3bd..0c718d019 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -125,7 +125,7 @@ addAuthorizedKeysCommand rsynconly dir pubkey = intercalate "&&" echoval v = "echo " ++ shellEscape v wrapper = "~/.ssh/git-annex-shell" script = - [ shebang + [ shebang_portable , "set -e" , "if [ \"x$SSH_ORIGINAL_COMMAND\" != \"x\" ]; then" , runshell "$SSH_ORIGINAL_COMMAND" diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs index c1605bee2..6a50e13f6 100644 --- a/Assistant/XMPP/Git.hs +++ b/Assistant/XMPP/Git.hs @@ -156,7 +156,7 @@ xmppPush cid gitpush handledeferred = runPush SendPack cid handledeferred $ do let wrapper = tmpdir </> "git-remote-xmpp" program <- readProgramFile writeFile wrapper $ unlines - [ shebang + [ shebang_local , "exec " ++ program ++ " xmppgit" ] modifyFileMode wrapper $ addModes executeModes |