From: Frederic Marchal <fmarchal@users.sourceforge.net>
Date: Sat, 12 Jan 2013 09:20:46 +0000 (+0100)
Subject: Packaging script accepts a tag with a translation suffix
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b777a75857f4c9502ad7430d781d563eb096d0b5;p=thirdparty%2Fsarg.git

Packaging script accepts a tag with a translation suffix

When a translation is submitted after the version has been tagged, a new
tag is added with the language as a suffix. It must be accepted by the
packaging script.
---

diff --git a/archive.sh b/archive.sh
index dc3621f..9a8da29 100755
--- a/archive.sh
+++ b/archive.sh
@@ -55,10 +55,11 @@ if [[ -n "$Untracked" ]] ; then
 fi
 
 # is the git tag set?
-GitVersion=$(git describe)
-if [[ "$GitVersion" != "$Version" ]] ; then
+# 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 \"$Version\" -m \"$Version\""
+	echo "git tag -a \"v$Version\" -m \"v$Version\""
 	exit 1
 fi