From 4855527852d195df9546266b5bb3d6fbe399c05b Mon Sep 17 00:00:00 2001
From: avg <avg@FreeBSD.org>
Date: Sun, 12 Feb 2012 14:54:19 +0000
Subject: newvers.sh: unbreak git/git-svn support

MFC after:	2 weeks
---
 sys/conf/newvers.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'sys/conf/newvers.sh')

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 44d74fe..cd523ca 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin; do
 		svnversion=${dir}/svnversion
 		break
 	fi
-	if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
-		git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
-		break
-	fi
 done
+if [ -d "${SYSDIR}/../.git" ] ; then
+	for dir in /bin /usr/bin /usr/local/bin; do
+		if [ -x "${dir}/git" ] ; then
+			git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+			break
+		fi
+	done
+fi
 
 if [ -n "$svnversion" ] ; then
 	svn=`cd ${SYSDIR} && $svnversion`
-- 
cgit v1.1