From b2cc11dd5e341a8f1aee0b492c086cf452c1a308 Mon Sep 17 00:00:00 2001 From: o9000 Date: Sun, 23 Apr 2017 17:01:07 +0200 Subject: [PATCH] Build script --- get_version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/get_version.sh b/get_version.sh index 9421dd4..986f11e 100755 --- a/get_version.sh +++ b/get_version.sh @@ -33,10 +33,10 @@ then fi VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY else - VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2) + VERSION=$(head -n 1 ChangeLog || head -n 1 ../ChangeLog | cut -d ' ' -f 2) if [ $VERSION = "master" ] then - VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1) + VERSION=$VERSION-$(head -n 1 ChangeLog || head -n 1 ../ChangeLog | cut -d ' ' -f 1) fi fi