projects
/
working
/
Evergreen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f3567b
)
When auto-versioning, use last piece of branch
user/tsbere@mvlc.org/installer
author
Thomas Berezansky
<tsbere@mvlc.org>
Wed, 25 May 2011 02:20:20 +0000
(22:20 -0400)
committer
Thomas Berezansky
<tsbere@mvlc.org>
Wed, 25 May 2011 02:20:20 +0000
(22:20 -0400)
Specifically, last / delimited piece.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Open-ILS/xul/staff_client/Makefile.am
patch
|
blob
|
history
diff --git
a/Open-ILS/xul/staff_client/Makefile.am
b/Open-ILS/xul/staff_client/Makefile.am
index
d210ef2
..
318329d
100644
(file)
--- a/
Open-ILS/xul/staff_client/Makefile.am
+++ b/
Open-ILS/xul/staff_client/Makefile.am
@@
-19,7
+19,7
@@
CHROME_LOCALES = $$(ls -1 chrome/locale)
SKIN_CSS = $$(ls -1 server/skin/*css | sed -e "s/.css/_custom.css/")
UPDATESDIR=@localstatedir@/updates
-GIT_BRANCH=$$(
git rev-parse --abbrev-ref HEAD || echo master
)
+GIT_BRANCH=$$(
echo $$(git rev-parse --abbrev-ref HEAD || echo master) | sed 's|.*/||'
)
GIT_TAG=$$(git rev-parse --short HEAD) # For auto-tagging builds
export NSIS_EXTRAOPTS