From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Sat, 17 Nov 2012 20:32:47 +0000 (+0100)
Subject: Take a tag with a translation into account
X-Git-Tag: v2.3.3_da2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93f3c5639bbbcd2e8a7c9d41083d3b74bf78f747;p=thirdparty%2Fsarg.git

Take a tag with a translation into account
---

diff --git a/archive.sh b/archive.sh
index dad1e92..9a8da29 100755
--- a/archive.sh
+++ b/archive.sh
@@ -55,7 +55,8 @@ if [[ -n "$Untracked" ]] ; then
 fi
 
 # is the git tag set?
-GitVersion=$(git describe)
+# a valid tag can be v2.3.3 or v2.3.3_da to indicate version 2.3.3 with the Danish translation
+GitVersion=$(git describe | sed -e 's/^\(v[0-9][0-9.]*\)_.*/\1/')
 if [[ "$GitVersion" != "v$Version" ]] ; then
 	echo "Git tag not set for version $Version. Use command:"
 	echo "git tag -a \"v$Version\" -m \"v$Version\""