diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-26 17:19:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-26 17:23:45 -0400 |
| commit | ae5533c707148088a14130da7c3ca23bb113d309 (patch) | |
| tree | 2659507e298e0d071d32054ae626c76388ec2360 /ui-macos | |
| parent | 6dfae4212ea292199e0ab215f4f27af182caf74a (diff) | |
install a git-annex-shell shim script when the standalone OSX app runs
I put it in ~/.ssh/ because there's no reliable way to get it into PATH,
and OSX ssh doesn't even honor user's PATH by default.
authorized_keys generators will need to check if it's there. Not done yet.
Diffstat (limited to 'ui-macos')
| -rwxr-xr-x | ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp | 4 | ||||
| -rwxr-xr-x | ui-macos/git-annex.app/Contents/MacOS/runshell | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp b/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp index 7955bef15..565c3d1cb 100755 --- a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp +++ b/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp @@ -12,8 +12,8 @@ fi # If this is a standalone app, set a variable that git-annex can use to # install itself. if [ -e "$base/bin/git-annex" ]; then - GIT_ANNEX_OSX_WEBAPP_PROGRAM="$base/bin/git-annex" - export OSX_GIT_ANNEX_APP_PROGRAM + GIT_ANNEX_OSX_APP_BASE="$base" + export GIT_ANNEX_OSX_APP_BASE fi "$base/runshell" git-annex webapp "$@" diff --git a/ui-macos/git-annex.app/Contents/MacOS/runshell b/ui-macos/git-annex.app/Contents/MacOS/runshell index 78ba3bf0c..ade917686 100755 --- a/ui-macos/git-annex.app/Contents/MacOS/runshell +++ b/ui-macos/git-annex.app/Contents/MacOS/runshell @@ -47,7 +47,7 @@ export GIT_EXEC_PATH if [ "$1" ]; then cmd="$1" shift 1 - "$cmd" "$@" + exec "$cmd" "$@" else $SHELL fi |