From dbe7fa9c116368172c1eaac59a9ca2c5664ebd1c Mon Sep 17 00:00:00 2001 From: Yuri Blankenstein Date: Thu, 22 Feb 2024 18:10:36 +0100 Subject: [PATCH] #8 Fix version qualifier script for full releases --- versionQualifier.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/versionQualifier.sh b/versionQualifier.sh index 43dd014..d024836 100755 --- a/versionQualifier.sh +++ b/versionQualifier.sh @@ -13,11 +13,16 @@ QUALIFIER_POSTFIX="dev" if [ $# -gt 0 ] then - QUALIFIER_POSTFIX=$(echo $1 | sed -e 's/^[^-]*-//') + QUALIFIER_POSTFIX=$(echo $1 | cut -s -d '-' -f2-) fi # Get Git last commit date. GIT_DATE_EPOCH=$(git log -1 --format=%cd --date=raw | cut -d ' ' -f 1) GIT_DATE=$(date -d @$GIT_DATE_EPOCH -u +%Y%m%d-%H%M%S) -echo "v$GIT_DATE-$QUALIFIER_POSTFIX" \ No newline at end of file +if [ -z "$QUALIFIER_POSTFIX" ] +then + echo "v$GIT_DATE" +else + echo "v$GIT_DATE-$QUALIFIER_POSTFIX" +fi \ No newline at end of file