From 38ae733f4f525bb5cfaddc04c9b250551dca93e5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Dec 2012 12:27:32 -0400 Subject: furnish git with an (empty) template directory in standalone builds This will stop git-init complaining about missing template directory. --- Makefile | 2 ++ standalone/linux/runshell | 7 ++++++- standalone/osx/git-annex.app/Contents/MacOS/runshell | 7 ++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4196a1167..e3ccbd548 100644 --- a/Makefile +++ b/Makefile @@ -173,6 +173,7 @@ linuxstandalone: install -d "$(LINUXSTANDALONE_DEST)/git-core" (cd "$(shell git --exec-path)" && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/git-core && tar x) + install -d "$(LINUXSTANDALONE_DEST)/templates" touch "$(LINUXSTANDALONE_DEST)/libdirs.tmp" for lib in $$(ldd "$(LINUXSTANDALONE_DEST)"/bin/* $$(find "$(LINUXSTANDALONE_DEST)"/git-core/ -type f) | grep -v -f standalone/linux/glibc-libs | grep -v "not a dynamic executable" | egrep '^ ' | sed 's/^\t//' | sed 's/.*=> //' | cut -d ' ' -f 1 | sort | uniq); do \ @@ -217,6 +218,7 @@ osxapp: done (cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x) + install -d "$(LINUXSTANDALONE_DEST)/templates" runghc Build/OSXMkLibs.hs $(OSXAPP_BASE) rm -f tmp/git-annex.dmg 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 -- cgit v1.2.3