From 750c62548eb10e79ff35a963df248ccfb064ec24 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Tue, 31 May 2016 14:04:16 -0700 Subject: Fix build-root/scripts/version to not have spurious ~ Change-Id: Id28f134e3a4aa19c5756014d53004501db0d0c88 Signed-off-by: Ed Warnicke --- build-root/scripts/version | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build-root/scripts/version') diff --git a/build-root/scripts/version b/build-root/scripts/version index bf7e3155..8724ced3 100755 --- a/build-root/scripts/version +++ b/build-root/scripts/version @@ -15,13 +15,12 @@ fi if [ "$1" = "rpm-release" ]; then [ -z "${ADD}" ] && echo release && exit - CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/') - echo ${ADD}~${CMT}${BLD} + echo ${ADD}${CMT:+~${CMT}}${BLD} exit fi if [ -n "${ADD}" ]; then - echo ${TAG}-${ADD}~${CMT}${BLD} + echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD} else echo ${TAG} fi -- cgit 1.2.3-korg