aboutsummaryrefslogtreecommitdiff
path: root/Build/LinuxMkLibs.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-03-27 16:06:50 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-03-27 16:06:50 -0400
commitd412f065a04541525e17c13b7f1ef20184baeda8 (patch)
tree98ee40ea72a5b1efc49a0ed0abc5788b45a86940 /Build/LinuxMkLibs.hs
parentcc8a6c9d89941f6b2c6ae2b46d4502d7214d9079 (diff)
Better fix for standalone tarball git-annex sync linker shim bug, that works for "git annex sync" as well as "git-annex sync".
Diffstat (limited to 'Build/LinuxMkLibs.hs')
-rw-r--r--Build/LinuxMkLibs.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs
index 9e829178c..300ace69d 100644
--- a/Build/LinuxMkLibs.hs
+++ b/Build/LinuxMkLibs.hs
@@ -69,6 +69,8 @@ installLinkerShim top linker exe = do
createSymbolicLink link (top </> exelink)
writeFile exe $ unlines
[ "#!/bin/sh"
+ , "GIT_ANNEX_PROGRAMPATH=\"$0\""
+ , "export GIT_ANNEX_PROGRAMPATH"
, "exec \"$GIT_ANNEX_DIR/" ++ exelink ++ "\" --library-path \"$GIT_ANNEX_LD_LIBRARY_PATH\" \"$GIT_ANNEX_DIR/shimmed/" ++ base ++ "/" ++ base ++ "\" \"$@\""
]
modifyFileMode exe $ addModes executeModes