diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-10 12:20:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-10 12:20:33 -0400 |
| commit | 4b9f753049b28c5452c2ae1483612a367293302a (patch) | |
| tree | eec824332f756be4c473771b18895ca571a90e8a /standalone | |
| parent | e2dd3ae351cbe7b2b1a027ef257808dde02d899f (diff) | |
| parent | 35b05c4cfc9a3c86a7f3b0550d93f52f3ec6e28b (diff) | |
Merge branch 'master' into desymlink
Diffstat (limited to 'standalone')
3 files changed, 8 insertions, 22 deletions
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git-annex b/standalone/osx/git-annex.app/Contents/MacOS/git-annex index cda5b569b..f6b9d9c78 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/git-annex +++ b/standalone/osx/git-annex.app/Contents/MacOS/git-annex @@ -17,7 +17,7 @@ cd "$orig" # If this is a standalone app, set a variable that git-annex can use to # install itself. -if [ -e "$base/bin/git-annex" ]; then +if [ -e "$base/git-annex" ]; then GIT_ANNEX_APP_BASE="$base" export GIT_ANNEX_APP_BASE fi diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp index 61a9bbbeb..b221db32a 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp +++ b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp @@ -17,7 +17,7 @@ cd "$orig" # If this is a standalone app, set a variable that git-annex can use to # install itself. -if [ -e "$base/bin/git-annex" ]; then +if [ -e "$base/git-annex" ]; then GIT_ANNEX_APP_BASE="$base" export GIT_ANNEX_APP_BASE fi diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell index 3366620ab..03b6befdf 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/runshell +++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell @@ -1,6 +1,6 @@ #!/bin/sh -# Runs a shell command (or interactive shell) using the binaries and -# libraries bundled with this app. +# Runs a shell command (or interactive shell) using the binaries +# bundled with this app. set -e @@ -11,12 +11,12 @@ if [ ! -d "$base" ]; then exit 1 fi -if [ ! -e "$base/bin/git-annex" ]; then - echo "** base directory $base does not contain bin/git-annex" >&2 +if [ ! -e "$base/git-annex" ]; then + echo "** base directory $base does not contain git-annex" >&2 exit 1 fi -if [ ! -e "$base/bin/git" ]; then - echo "** base directory $base does not contain bin/git" >&2 +if [ ! -e "$base/git" ]; then + echo "** base directory $base does not contain git" >&2 exit 1 fi @@ -46,20 +46,6 @@ export ORIG_PATH PATH=$base/bin:$PATH export PATH -# This makes the linker first look in the library directories bundled -# in this app. Only if it fails to find a library there will a system -# library be used. -# -# This seems to work better than DYLD_LIBRARY_PATH, which can force -# the wrong version of a library to be used, if the app bundles two -# 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 |