From: Thomas Berezansky <tsbere@mvlc.org>
Date: Wed, 25 May 2011 02:20:20 +0000 (-0400)
Subject: When auto-versioning, use last piece of branch
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=044f1f18ca74bf400646f106ee065c663654e697;p=evergreen%2Fbjwebb.git

When auto-versioning, use last piece of branch

Specifically, last / delimited piece.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
---

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index d210ef2aa..318329dfa 100644
--- 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