From 7dbce842cb6479adf982448d0ecf94d620e9e754 Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Thu, 15 Oct 2015 15:15:58 -0600 Subject: [PATCH] Fixup version file Some mixups from trying to copy other projects led to incorrect description. Signed-off-by: Keith Busch --- NVME-VERSION-GEN | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NVME-VERSION-GEN b/NVME-VERSION-GEN index cbfc8527..dd97433c 100755 --- a/NVME-VERSION-GEN +++ b/NVME-VERSION-GEN @@ -10,14 +10,14 @@ LF=' # then try git-describe, then default. if test -f version then - VN=`cat version` || VN="$DEF_VER" + VN=$(cat version) || VN="$DEF_VER" elif test -d .git -o -f .git && - VN=`git describe --match "nvme-[0-9]*" --abbrev=4 HEAD 2>/dev/null` && + VN=$(git describe --tags --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; v[0-9]*) git update-index -q --refresh - test -z "`git diff-index --name-only HEAD --`" || + test -z "$(git diff-index --name-only HEAD --)" || VN="$VN-dirty" ;; esac then @@ -26,11 +26,11 @@ else VN="$DEF_VER" fi -VN=`expr "$VN" : v*'\(.*\)'` +VN=$(expr "$VN" : v*'\(.*\)') if test -r $GVF then - VC=`sed -e 's/^NVME_VERSION = //' <$GVF` + VC=$(sed -e 's/^NVME_VERSION = //' <$GVF) else VC=unset fi -- 2.50.1