]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Take a tag with a translation into account
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Sat, 17 Nov 2012 20:32:47 +0000 (21:32 +0100)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Sat, 17 Nov 2012 20:33:09 +0000 (21:33 +0100)
archive.sh

index dad1e926c783a9fe9de095426f1593de9a722af7..9a8da29ffc4c1854d0d69a75537e40b578c4c595 100755 (executable)
@@ -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\""