diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-30 15:04:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-30 15:04:31 -0400 |
| commit | 6ba0567ba893af61922d9d097e57e0f95d739e85 (patch) | |
| tree | db6bf86e82a1f19a9018b611856005cd48e86f08 | |
| parent | 7311043c4d17cf279b03dc2fb2d1120403ddb9c9 (diff) | |
OSX: Make git-annex-webapp run in the background, so that the app icon can be clicked on the open a new webapp when the assistant is already running.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp.mdwn | 4 | ||||
| -rwxr-xr-x | standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 93aece109..a60d36f63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ git-annex (4.20130724) UNRELEASED; urgency=low at once in indirect mode. * assistant: Fix bug that caused it to stall when adding a very large number of files at once (around 5 thousand). + * OSX: Make git-annex-webapp run in the background, so that the app icon + can be clicked on the open a new webapp when the assistant is already + running. -- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400 diff --git a/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp.mdwn b/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp.mdwn index fb439f7a8..3a93c3881 100644 --- a/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp.mdwn +++ b/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp.mdwn @@ -25,3 +25,7 @@ From .git/annex/daemon.log: (scanning...) [2013-07-28 00:01:08 CDT] Watcher: Performing startup scan (started...) """]] + +> [[done]]; I added the `&` to git-annex-shell. +> Hopefully that does not cause any other unwanted behavior.. +> --[[Joey]] 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 cd93836d1..37a4984af 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp +++ b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp @@ -22,4 +22,5 @@ if [ -e "$base/git-annex" ]; then export GIT_ANNEX_APP_BASE fi -exec "$base/runshell" git-annex webapp "$@" +# OSX wants this to run in the background. +exec "$base/runshell" git-annex webapp "$@" & |