From f55dc1b64f5d99ee507c816a71a7236730537843 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 30 Jul 2013 15:04:31 -0400
Subject: [PATCH] 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.

---
 debian/changelog                                             | 3 +++
 doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp.mdwn            | 4 ++++
 standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 93aece1091..a60d36f637 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 fb439f7a88..3a93c3881e 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 cd93836d1e..37a4984af6 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 "$@" &