From 962d1e441c7d9623ded6762a2f65cbc506788736 Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 20 Aug 2009 01:58:31 +0200
Subject: [PATCH] newvers.sh: shorten version string

The inclusion of the git revision made the version string exceed a
single line, and also mostly duplicated the output.  If we have a git
revision available, use it instead of the standard version string.

Requested-by: dillon@
---
 sys/conf/newvers.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 49f97e49f6..e7b57cf9de 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -80,12 +80,10 @@ fi
 
 # obtain git commit name, like "v2.3.2.449.g84e97*"
 GITREV=$(${SRCDIR}/tools/gitrev.sh 2>/dev/null || true)
-if [ -n "$GITREV" ]; then
-	GITREV=" $GITREV"
-fi
 
 RELEASE="${REVISION}-${BRANCH}"
-VERSION="${TYPE} ${RELEASE}${GITREV}"
+VERSION="${TYPE} ${RELEASE}"
+[ -n "$GITREV" ] && VERSION="${TYPE} ${GITREV}-${BRANCH}"
 
 if [ "X${PARAMFILE}" != "X" ]; then
 	RELDATE=$(awk '/__DragonFly_version.*propagated to newvers/ {print $3}' \
-- 
2.41.0