diff options
author | Joey Hess <joey@kitenet.net> | 2012-12-13 12:27:32 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-12-13 12:27:32 -0400 |
commit | 38ae733f4f525bb5cfaddc04c9b250551dca93e5 (patch) | |
tree | c27967acd0df0115edb08dfe7c0643e6178f687d /standalone | |
parent | 2581ac61e032eb75b9a332ffea6fff16bf1833aa (diff) |
furnish git with an (empty) template directory in standalone builds
This will stop git-init complaining about missing template directory.
Diffstat (limited to 'standalone')
-rwxr-xr-x | standalone/linux/runshell | 7 | ||||
-rwxr-xr-x | standalone/osx/git-annex.app/Contents/MacOS/runshell | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/standalone/linux/runshell b/standalone/linux/runshell index e3d75d7a0..a1c93792d 100755 --- a/standalone/linux/runshell +++ b/standalone/linux/runshell @@ -58,8 +58,13 @@ export ORIG_GIT_EXEC_PATH GIT_EXEC_PATH=$base/git-core export GIT_EXEC_PATH +ORIG_GIT_TEMPLATE_DIR="$GIT_TEMPLATE_DIR" +export ORIG_GIT_TEMPLATE_DIR +GIT_TEMPLATE_DIR="$base/templates" +export GIT_TEMPLATE_DIR + # Indicate which variables were exported above. -GIT_ANNEX_STANDLONE_ENV="PATH LD_LIBRARY_PATH GIT_EXEC_PATH" +GIT_ANNEX_STANDLONE_ENV="PATH LD_LIBRARY_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR" export GIT_ANNEX_STANDLONE_ENV if [ "$1" ]; then diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell index 40c1be615..bdeee6d97 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/runshell +++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell @@ -51,8 +51,13 @@ export ORIG_GIT_EXEC_PATH GIT_EXEC_PATH=$base export GIT_EXEC_PATH +ORIG_GIT_TEMPLATE_DIR="$GIT_TEMPLATE_DIR" +export ORIG_GIT_TEMPLATE_DIR +GIT_TEMPLATE_DIR="$base/templates" +export GIT_TEMPLATE_DIR + # Indicate which variables were exported above. -GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH" +GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR" export GIT_ANNEX_STANDLONE_ENV if [ "$1" ]; then |