ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build-root/scripts/version to not have spurious ~

Browse Source 
Change-Id: Id28f134e3a4aa19c5756014d53004501db0d0c88
Signed-off-by: Ed Warnicke <eaw@cisco.com>
This commit is contained in:
Ed Warnicke
2016-05-31 14:04:16 -07:00
committed by Dave Wallace
parent 34e7772443
commit 750c62548e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build-root/scripts/version
View File

@ -15,13 +15,12 @@ fi
if [ "$1" = "rpm-release" ]; then if [ "$1" = "rpm-release" ]; then
[ -z "${ADD}" ] && echo release && exit [ -z "${ADD}" ] && echo release && exit
CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/') echo ${ADD}${CMT:+~${CMT}}${BLD}
echo ${ADD}~${CMT}${BLD}
exit exit
fi fi
if [ -n "${ADD}" ]; then if [ -n "${ADD}" ]; then
echo ${TAG}-${ADD}~${CMT}${BLD} echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
else else
echo ${TAG} echo ${TAG}
fi fi