add osxapp target

Not fully tested.

3 files changed, 56 insertions, 1 deletions

diff --git a/ui-macos/git-annex.app/Contents/Info.plist b/ui-macos/git-annex.app/Contents/Info.plist
index 36973a498..ced9948da 100644
--- a/ui-macos/git-annex.app/Contents/Info.plist
+++ b/ui-macos/git-annex.app/Contents/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>git-annex</string>
+	<string>git-annex-webapp</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>GPL 3</string>
 	<key>CFBundleGetInfoString</key>
diff --git a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp b/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp
new file mode 100755
index 000000000..dc5c556b4
--- /dev/null
+++ b/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp
@@ -0,0 +1,11 @@
+#!/bin/sh
+base="$(dirname $0)"
+if [ ! -d "$base" ]; then
+	echo "** cannot find base directory (I seem to be $0)" >&2
+	exit 1
+fi
+if [ ! -e "$base/runshell" ]; then
+	echo "** cannot find $base/runshell" >&2
+	exit 1
+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
new file mode 100755
index 000000000..e6c932720
--- /dev/null
+++ b/ui-macos/git-annex.app/Contents/MacOS/runshell
@@ -0,0 +1,44 @@
+#!/bin/sh
+set -e
+
+base="$(dirname $0)"
+
+if [ ! -d "$base" ]; then
+	echo "** cannot find base directory (I seem to be $0)" >&2
+	exit 1
+fi
+
+if [ ! -e "$base/bin/git-annex" ]; then
+	echo "** base directory $base does not contain bin/git-annex" >&2
+	exit 1
+fi
+if [ ! -e "$base/bin/git" ]; then
+	echo "** base directory $base does not contain bin/git" >&2
+	exit 1
+fi
+
+# Get absolute path to base, to avoid breakage when things change directories.
+orig="$(pwd)"
+cd "$base"
+base="$(pwd)"
+cd "$orig"
+
+# Put our binaries first, so our overloaded libs don't get used with
+# system binaries.
+# Also avoids issues with out of date system binaries.
+PATH=$base/bin:$PATH
+export PATH
+
+DYLD_LIBRARY_PATH=$base/lib:$DYLD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+GIT_EXEC_PATH=$base/git-core
+export GIT_EXEC_PATH
+
+if [ "$1" ]; then
+	cmd="$1"
+	shift 1
+	"$cmd" "$@"
+else
+	$SHELL
+fi