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.
This commit is contained in:
parent
45f884418f
commit
e2c98f5788
3 changed files with 6 additions and 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
|
||||
|
||||
|
|
2
Makefile
2
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"; \
|
||||
|
|
|
@ -57,3 +57,5 @@ $> find .git
|
|||
"""]]
|
||||
|
||||
[[!meta author=yoh]]
|
||||
|
||||
> [[done]] --[[Joey]]
|
||||
|
|
Loading…
Add table
Reference in a new issue