From f730f81c0e7138c46e99272867304bc60fb5eb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Thu, 3 Dec 2015 00:46:21 +0100 Subject: [PATCH] Build: fix semver_into so that it doesnt misparse versions like "2.3.4" --- build-support/factor.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/build-support/factor.sh b/build-support/factor.sh index ee71c0444f..7a64fb52a2 100755 --- a/build-support/factor.sh +++ b/build-support/factor.sh @@ -113,22 +113,22 @@ set_md5sum() { } semver_into() { - CLANG_RE_OLD="^([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3-5 - RE_SEMVER="^([0-9]*)\.([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3.3-5 - if [[ $1 =~ $CLANG_RE_OLD ]] ; then - export "$2=${BASH_REMATCH[1]}" - export "$3=${BASH_REMATCH[2]}" - export "$4=0" - export "$5=${BASH_REMATCH[3]}" - elif [[ $1 =~ $RE_SEMVER ]] ; then - export "$2=${BASH_REMATCH[1]}" - export "$3=${BASH_REMATCH[2]}" - export "$4=${BASH_REMATCH[3]}" - export "$5=${BASH_REMATCH[4]}" - else - echo "unsupported version number, please report a bug: $1" - exit 123 - fi + RE_SEMVER="^([0-9]*)\.([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3.3-5 + CLANG_RE_OLD="^([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3-5 + if [[ $1 =~ $RE_SEMVER ]] ; then + export "$2=${BASH_REMATCH[1]}" + export "$3=${BASH_REMATCH[2]}" + export "$4=${BASH_REMATCH[3]}" + export "$5=${BASH_REMATCH[4]}" + elif [[ $1 =~ $CLANG_RE_OLD ]] ; then + export "$2=${BASH_REMATCH[1]}" + export "$3=${BASH_REMATCH[2]}" + export "$4=0" + export "$5=${BASH_REMATCH[3]}" + else + echo "unsupported version number, please report a bug: $1" + exit 123 + fi } # issue 1440