aboutsummaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-26 11:54:15 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-26 11:54:15 -0400
commit8ee9733ff3dd8b9ff7cf1552f7eebf96b4ade7bb (patch)
tree38d4219ac8410d96bdfc937c98ca963fce4fc0d2 /standalone
parentd419c190914ea4c5a9959bb585df02ae79d7d41b (diff)
Include magic database in the linux and OSX standalone builds.
Diffstat (limited to 'standalone')
-rw-r--r--standalone/licences.gzbin55832 -> 55882 bytes
-rwxr-xr-xstandalone/osx/git-annex.app/Contents/MacOS/runshell6
2 files changed, 5 insertions, 1 deletions
diff --git a/standalone/licences.gz b/standalone/licences.gz
index e85b038fb..b126f88c0 100644
--- a/standalone/licences.gz
+++ b/standalone/licences.gz
Binary files differ
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell
index 56fc77f38..17c95698c 100755
--- a/standalone/osx/git-annex.app/Contents/MacOS/runshell
+++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell
@@ -77,7 +77,11 @@ export ORIG_GIT_TEMPLATE_DIR
GIT_TEMPLATE_DIR="$bundle/templates"
export GIT_TEMPLATE_DIR
-# Indicate which variables were exported above.
+GIT_ANNEX_DIR="$bundle"
+export GIT_ANNEX_DIR
+
+# Indicate which variables were exported above and should be cleaned
+# when running non-bundled programs.
GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR"
export GIT_ANNEX_STANDLONE_ENV