X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fscripts%2Fversion;h=f9f3d21564167deab85fb8d33bae8dc7eb8fb245;hb=refs%2Fchanges%2F67%2F34367%2F2;hp=7e7711637cb0c7ee90517d835026849308dcd2c0;hpb=1060332e62d1216bf33c697d0a54ba35d4903eb3;p=vpp.git diff --git a/src/scripts/version b/src/scripts/version index 7e7711637cb..f9f3d215641 100755 --- a/src/scripts/version +++ b/src/scripts/version @@ -20,7 +20,7 @@ cd "$path" if [ -f .version ]; then vstring=$(cat .version) else - vstring=$(git describe --long) + vstring=$(git describe --long --match "v*") if [ $? != 0 ]; then exit 1 fi @@ -36,7 +36,7 @@ if [ -z "${POINT}" ]; then # verify that we are not: # - directly on the XX.YY tag (then ADD will equal "0" by its construction) # - not on any of the builds past "-rc[123]" but before releases - then ADD will be "rc[123]" - if [ "${ADD}" != "0" -a "${ADD}" != "rc0" -a "${ADD}" != "rc1" -a "${ADD}" != "rc2" ]; then + if [ "${ADD}" != "0" -a "${ADD}" != "rc0" -a "${ADD}" != "rc1" -a "${ADD}" != "rc2" -a "${ADD}" != "rc3" -a "${ADD}" != "rc4" ]; then TAG="${TAG}.0" fi fi