From ae8912003022be1a8cd77684824a89460c7ff646 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 6 May 2013 15:58:13 -0400 Subject: fix use of wrong shebang when android is installing git-annex-shell wrapper on server --- Utility/Shell.hs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Utility') 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 -- cgit v1.2.3