From 58a8269cd88628a8edb8b0e4e3cde99f89269860 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 21 Jan 2016 10:04:59 +0100 Subject: [PATCH] Changed: Allow to specify code path and use egrep --HG-- branch : develop --- dist/debian/ryzomcore_version.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dist/debian/ryzomcore_version.sh b/dist/debian/ryzomcore_version.sh index c072095f2..55129da1d 100755 --- a/dist/debian/ryzomcore_version.sh +++ b/dist/debian/ryzomcore_version.sh @@ -1,6 +1,11 @@ #!/bin/sh -CODEROOT=../../code +CODEROOT=$1 + +if [ -z "$CODEROOT" ] +then + CODEROOT=../../code +fi VERSION_FILE=$CODEROOT/CMakeLists.txt @@ -12,10 +17,11 @@ fi parse_version() { - FILE=$1 - VAR=$2 + PREFIX=$1 + FILE=$2 + VAR=$3 - V=$(grep -o -P "NL_$VAR [0-9]+" $FILE | awk '{print $2}' | head -n 1) + V=$(egrep -o $PREFIX"_$VAR [0-9]+" $FILE | awk '{print $2}' | head -n 1) if [ -z "$V" ] then @@ -26,9 +32,9 @@ parse_version() export $VAR=$V } -parse_version $VERSION_FILE VERSION_MAJOR -parse_version $VERSION_FILE VERSION_MINOR -parse_version $VERSION_FILE VERSION_PATCH +parse_version NL $VERSION_FILE VERSION_MAJOR +parse_version NL $VERSION_FILE VERSION_MINOR +parse_version NL $VERSION_FILE VERSION_PATCH VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH