Re: [RFC] fix git detection code in newvers.sh when svn installed

On 6 January 2012 21:50, Oliver Pinter <pinter_at_tresorium.hu> wrote:
> Hi All!
>
> When svn installed and the source stored in git, then now the version
> detection failed. The attached patch fixed this situation.
>

FWIW, a different version proposed by Maciej Milewski on -current
some time ago. I don't have/use git, so I cannot test these changes.
It is good in the sense that it doesn't duplicate a search path.
The patch is below for reference:

--- sys/conf/newvers.sh	2011-11-19 00:56:50.795815738 +0100
+++ sys/conf/newvers-patched.sh	2011-11-19 00:58:21.187818982 +0100
_at__at_ -88,14 +88,14 _at__at_
 i=`${MAKE:-make} -V KERN_IDENT`

 for dir in /bin /usr/bin /usr/local/bin; do
-	if [ -x "${dir}/svnversion" ] ; then
-		svnversion=${dir}/svnversion
-		break
-	fi
 	if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
 		git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
 		break
 	fi
+	if [ -x "${dir}/svnversion" ] ; then
+		svnversion=${dir}/svnversion
+		break
+	fi
 done

 if [ -n "$svnversion" ] ; then


-- 
wbr,
pluknet