summaryrefslogtreecommitdiff
path: root/standalone/osx
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-27 17:05:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-27 17:05:29 -0400
commitaf2e65f1c25b72643dfec6ae2a9284ebeeb70ec5 (patch)
tree0246a2c6e0ef184c310920a4cc5e9e62a56ac0ab /standalone/osx
parentece8d76d67e2c22e33963f52a341f4b3a59d3ec4 (diff)
The standalone builds now unset their special path and library path variables before running the system web browser.
Should fix a crash reported on OSX.
Diffstat (limited to 'standalone/osx')
-rwxr-xr-xstandalone/osx/git-annex.app/Contents/MacOS/runshell10
1 files changed, 10 insertions, 0 deletions
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell
index c409d814b..51748285a 100755
--- a/standalone/osx/git-annex.app/Contents/MacOS/runshell
+++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell
@@ -41,6 +41,8 @@ fi
# Put our binaries first, to avoid issues with out of date or incompatable
# system binaries.
+ORIG_PATH="$PATH"
+export ORIG_PATH
PATH=$base/bin:$PATH
export PATH
@@ -53,12 +55,20 @@ export PATH
# different versions of a single library. And it seems to work better
# than DYLD_FALLBACK_LIBRARY_PATH, which fails to override old system
# versions of libraries when a program in the app needs a newer version.
+ORIG_DYLD_ROOT_PATH="$DYLD_ROOT_PATH"
+export ORIG_DYLD_ROOT_PATH
DYLD_ROOT_PATH=$base
export DYLD_ROOT_PATH
+ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH"
+export ORIG_GIT_EXEC_PATH
GIT_EXEC_PATH=$base/git-core
export GIT_EXEC_PATH
+# Indicate which variables were exported above.
+GIT_ANNEX_STANDLONE_ENV="PATH DYLD_ROOT_PATH GIT_EXEC_PATH"
+export GIT_ANNEX_STANDLONE_ENV
+
if [ "$1" ]; then
cmd="$1"
shift 1