mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

The standalone builds now unset their special path and library path variables before running the system web browser.

Browse source 
Should fix a crash reported on OSX.
This commit is contained in:
Joey Hess 2012-11-27 17:05:29 -04:00
parent 6a9ba6ad06
commit 2525fefbb9
6 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
standalone/osx/git-annex.app/Contents/MacOS/runshell
View file

@ -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