From fe94f7e30168b0b7dec2173eb0b4c92c048b5dd5 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Mon, 5 Sep 2016 14:05:25 +0200 Subject: [PATCH] diamond-setup: Handle VERSION properly Signed-off-by: Boris Ranto --- diamond-setup/build/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/diamond-setup/build/build b/diamond-setup/build/build index daf44332..603310bb 100644 --- a/diamond-setup/build/build +++ b/diamond-setup/build/build @@ -26,6 +26,9 @@ if [ -x install-deps.sh ]; then ./install-deps.sh fi +# Get the version +VERSION=$(./version.sh) + # Make sure the repo is clean echo "Cleaning up the repo" git clean -fxd @@ -34,7 +37,7 @@ echo "Building source distribution" python setup.py sdist # Prepare the spec file for build -sed -e "s/@VERSION@/${vers}/g" < diamond.spec.in > dist/diamond.spec +sed -e "s/@VERSION@/${VERSION}/g" < diamond.spec.in > dist/diamond.spec # Save these so that we can later inject them into the build script cat > dist/sha1 << EOF @@ -46,5 +49,5 @@ BRANCH=${BRANCH} EOF cat > dist/version << EOF -VERSION=$(./version.sh) +VERSION=${VERSION} EOF -- 2.39.5