summaryrefslogtreecommitdiff
path: root/Utility/Shell.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-06 15:58:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-06 15:58:13 -0400
commitae8912003022be1a8cd77684824a89460c7ff646 (patch)
treec79f54fe1654349312fc95dc4684300a63784bc6 /Utility/Shell.hs
parent7df05f6417794713d8c1a7c051f5723cba543542 (diff)
fix use of wrong shebang when android is installing git-annex-shell wrapper on server
Diffstat (limited to 'Utility/Shell.hs')
-rw-r--r--Utility/Shell.hs16
1 files changed, 11 insertions, 5 deletions
diff --git a/Utility/Shell.hs b/Utility/Shell.hs
index f3858af7f..2227dc767 100644
--- a/Utility/Shell.hs
+++ b/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