fix use of wrong shebang when android is installing git-annex-shell wrapper on server

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"

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"

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

Init.hs

@@ -106,7 +106,7 @@ preCommitHook = (</>) <$> fromRepo Git.localGitDir <*> pure "hooks/pre-commit"
 
 preCommitScript :: String
 preCommitScript = unlines
-	[ shebang
+	[ shebang_local
 	, "# automatically configured by git-annex"
 	, "git annex pre-commit ."
 	]

Utility/Shell.hs

@@ -9,12 +9,18 @@
 
 module Utility.Shell where
 
-shellPath :: FilePath
+shellPath_portable :: FilePath
+shellPath_portable = "/bin/sh"
+
+shellPath_local :: FilePath
 #ifndef __ANDROID__
-shellPath = "/bin/sh"
+shellPath_local = shellPath_portable
 #else
-shellPath = "/system/bin/sh"
+shellPath_local = "/system/bin/sh"
 #endif
 
-shebang :: String
-shebang = "#!" ++ shellPath
+shebang_portable :: String
+shebang_portable = "#!" ++ shellPath_portable
+
+shebang_local :: String
+shebang_local = "#!" ++ shellPath_local