From 4e140dd334f6d282cda0233981f7b0feff283bd6 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 26 Oct 2023 14:09:26 +0200 Subject: [PATCH] Get version from tag if building from tag. --- scripts/get-version.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/get-version.sh b/scripts/get-version.sh index 39b009b..5e6d65e 100755 --- a/scripts/get-version.sh +++ b/scripts/get-version.sh @@ -7,8 +7,11 @@ if [ -s "$ROOT/../version.txt" ]; then VERSION=$(cat "$ROOT/../version.txt" | tr -d '[:space:]') fi if [ -z $VERSION ] && [ -d "$ROOT/../.git" ]; then + TAG=$(git tag --points-at HEAD | sed 's/v//') if [ "$1" == "--tar" ]; then VERSION=$(git describe --dirty --tags --always | sed 's/debian\///g') + elif [ -n "$TAG" ]; then + VERSION="$TAG" else VERSION=$(git log -1 --pretty=%H) fi