From: Keith Busch <keith.busch@intel.com>
Date: Thu, 15 Oct 2015 21:15:58 +0000 (-0600)
Subject: Fixup version file
X-Git-Tag: v0.2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7dbce842cb6479adf982448d0ecf94d620e9e754;p=users%2Fsagi%2Fnvme-cli.git

Fixup version file

Some mixups from trying to copy other projects led to incorrect
description.

Signed-off-by: Keith Busch <keith.busch@intel.com>
---

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