diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-02-10 13:55:54 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-02-10 13:55:54 -0400 |
commit | a12083999ac50e41e985996a3e25594d5dcd5f77 (patch) | |
tree | 082e43426b182e13a538de8d970fdfdbcc990d19 | |
parent | c568c4c095cf51808d9379a315deee53c1ae8f04 (diff) |
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.
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn | 2 |
3 files changed, 6 insertions, 0 deletions
@@ -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 @@ -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 8c75cc769..9f81f8ab5 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]] |