summaryrefslogtreecommitdiff
path: root/ui-macos/git-annex.app/Contents
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-25 10:27:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-25 10:27:21 -0400
commita8059df713ed85bbb8b0ceb49172514667fa840a (patch)
treefcf1cee79f249ef5c365c6e9efe88d327d6449be /ui-macos/git-annex.app/Contents
parent137ff3969bc85b80380dd6a9c3001191dbead990 (diff)
preserve library directories
Should avoid overwriting libraries when there are multiple versions of a library used by different programs.
Diffstat (limited to 'ui-macos/git-annex.app/Contents')
-rwxr-xr-xui-macos/git-annex.app/Contents/MacOS/runshell4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui-macos/git-annex.app/Contents/MacOS/runshell b/ui-macos/git-annex.app/Contents/MacOS/runshell
index e6c932720..82a75c401 100755
--- a/ui-macos/git-annex.app/Contents/MacOS/runshell
+++ b/ui-macos/git-annex.app/Contents/MacOS/runshell
@@ -29,7 +29,9 @@ cd "$orig"
PATH=$base/bin:$PATH
export PATH
-DYLD_LIBRARY_PATH=$base/lib:$DYLD_LIBRARY_PATH
+for lib in "$(cat libdirs)"; do
+ DYLD_LIBRARY_PATH="$base/$lib:$DYLD_LIBRARY_PATH"
+done
export DYLD_LIBRARY_PATH
GIT_EXEC_PATH=$base/git-core