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 dc3621fe935ace23a878e95ff0b0989ff1f440ce..9a8da29ffc4c1854d0d69a75537e40b578c4c595 100755 (executable)
--- 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