From bd2ca94ffe4339a5316bd4de600b5f36d1a065d1 Mon Sep 17 00:00:00 2001 From: o9000 Date: Sun, 26 Nov 2017 16:22:12 +0100 Subject: [PATCH] Cleanup versioning script --- get_version.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/get_version.sh b/get_version.sh index 2143381..533443d 100755 --- a/get_version.sh +++ b/get_version.sh @@ -1,6 +1,5 @@ #!/bin/sh -MAJOR=0.14 DIRTY="" if git status 1>/dev/null 2>/dev/null @@ -31,7 +30,7 @@ then DIRTY="-dirty" fi 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 + VERSION=$(git describe 2>/dev/null)$DIRTY else SCRIPT_DIR=$(dirname "$0") VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)