diff --git a/tools/prepareBuild.sh b/tools/prepareBuild.sh index 5d7ed24e..243b1983 100755 --- a/tools/prepareBuild.sh +++ b/tools/prepareBuild.sh @@ -28,10 +28,10 @@ _TOOLS_BASE_PATH=$(dirname $(readlink -f $0)) _BASE_PATH=${_TOOLS_BASE_PATH}/.. _TMP_PATH=${_BASE_PATH}/tmp -_MAJOR=$( git describe | sed 's,\([0-9]*\)\..*,\1,' ) -_MINOR=$( git describe | sed 's,[0-9]*\.\([0-9]*\)\..*,\1,' ) -_PATCH=$(( $( git describe | sed 's,[^x]*\.x[^0-9]*\([0-9]*\)[^0-9].*,\1,') + 0)) -_STAGE=$( git describe | sed 's,.*\.x-\([^-]*\).*,\1,' ) +_MAJOR=$( git describe | sed 's,\([0-9]*\)\..*,\1,' ) +_MINOR=$( git describe | sed 's,[0-9]*\.\([0-9]*\)\..*,\1,' ) +_PATCH=$( git describe | sed 's,[0-9]*\.[0-9]*\.\([0-9]*\)[^0-9].*,\1,' ) +_STAGE=$( git describe | sed 's,[^-]*-\([^-]*\).*,\1,' ) _VERSION="${_MAJOR}.${_MINOR}.${_PATCH}-${_STAGE}"