diff options
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/linux/runshell | 10 | ||||
| -rwxr-xr-x | standalone/osx/git-annex.app/Contents/MacOS/runshell | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/standalone/linux/runshell b/standalone/linux/runshell index 82d3ce2c5..816c3036e 100755 --- a/standalone/linux/runshell +++ b/standalone/linux/runshell @@ -41,17 +41,27 @@ 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 +ORIG_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" +export ORIG_LD_LIBRARY_PATH for lib in $(cat $base/libdirs); do LD_LIBRARY_PATH="$base/$lib:$LD_LIBRARY_PATH" done export LD_LIBRARY_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 LD_LIBRARY_PATH GIT_EXEC_PATH" +export GIT_ANNEX_STANDLONE_ENV + if [ "$1" ]; then cmd="$1" shift 1 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 |