From 1a5473c323230a830bfb8f353b73f1a3168cf9f5 Mon Sep 17 00:00:00 2001 From: Mark Pulford Date: Fri, 20 Jan 2012 21:38:36 +1030 Subject: Support building packages with version tags >1.x --- build-packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-packages.sh b/build-packages.sh index 2dacb8c..f8b47a7 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -7,8 +7,8 @@ # Files requiring a version bump VERSION_FILES="lua-cjson-2.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" -[ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '1.[0-9]*'`" -VERSION="`git describe --match '1.[0-9]*' $BRANCH`" +[ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '[1-3].[0-9]*'`" +VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`" VERSION="${VERSION//-/.}" PREFIX="lua-cjson-$VERSION" -- cgit v1.2.3-55-g6feb