From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 10 Feb 2017 17:55:54 +0000 (-0400)
Subject: Added git template directory to Linux standalone tarball and OSX app bundle.
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~275^2~637
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2c98f5788c94e4799de702667656333277b2aae;p=git-annex.git

Added git template directory to Linux standalone tarball and OSX app bundle.

Git does not provide a switch to find out where this directory is, and
while the git-init man page says it will always be in
/usr/share/git-core/templates, that's not the case on OSX with git
installed from homebrew. So, I used a hack taking the --man-path and
constructing a path from that. Works on both Debian and OSX at least.
---

diff --git a/CHANGELOG b/CHANGELOG
index 321f98c52e..9e2791286b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,8 @@ git-annex (6.20170102) UNRELEASED; urgency=medium
     inneficiently; they unncessarily hashed each file twice. They have
     been improved to only hash once.
   * import: Added --reinject-duplicates.
+  * Added git template directory to Linux standalone tarball and OSX
+    app bundle.
 
  -- Joey Hess <id@joeyh.name>  Fri, 06 Jan 2017 15:22:06 -0400
 
diff --git a/Makefile b/Makefile
index 2b9fabb511..cc254c438d 100644
--- a/Makefile
+++ b/Makefile
@@ -144,6 +144,7 @@ linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs
 	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"
+	(cd "$(shell git --man-path)"/../git-core/templates && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/templates && tar x)
 	install -d "$(LINUXSTANDALONE_DEST)/magic"
 	cp /usr/share/file/magic.mgc "$(LINUXSTANDALONE_DEST)/magic"
 	cp /usr/share/i18n -a "$(LINUXSTANDALONE_DEST)"
@@ -205,6 +206,7 @@ osxapp: Build/Standalone Build/OSXMkLibs
 
 	(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
 	install -d "$(OSXAPP_BASE)/templates"
+	(cd "$(shell git --man-path)"/../git-core/templates && tar c .) | (cd "$(OSXAPP_BASE)"/templates && tar x)
 	install -d "$(OSXAPP_BASE)/magic"
 	if [ -e "$(OSX_MAGIC_FILE)" ]; then \
 		cp "$(OSX_MAGIC_FILE)" "$(OSXAPP_BASE)/magic/magic.mgc"; \
diff --git a/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn b/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn
index 8c75cc7692..9f81f8ab54 100644
--- a/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn
+++ b/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn
@@ -57,3 +57,5 @@ $> find .git
 """]]
 
 [[!meta author=yoh]]
+
+> [[done]] --[[Joey]]