Date: Fri, 21 Jun 2013 06:03:49 GMT From: "Sergey V. Dyatko" <sergey.dyatko@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: bin/179800: [patch] use svnlite on newvers.sh Message-ID: <201306210603.r5L63nk2093497@oldred.freebsd.org> Resent-Message-ID: <201306210610.r5L6A1Mj038541@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179800
>Category: bin
>Synopsis: [patch] use svnlite on newvers.sh
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 21 06:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Sergey V. Dyatko
>Release: HEAD
>Organization:
>Environment:
FreeBSD tiger.minsk.domain 10.0-CURRENT FreeBSD 10.0-CURRENT #20 r251896:251900M: Tue Jun 18 12:29:44 FET 2013 root@tiger.minsk.domain:/usr/obj/usr/src/sys/tiger-desktop amd64
>Description:
seems strange to me import svnlite and not even try to use it on newvers.sh:)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh (revision 252052)
+++ sys/conf/newvers.sh (working copy)
@@ -88,14 +88,17 @@
i=`${MAKE:-make} -V KERN_IDENT`
compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
-for dir in /bin /usr/bin /usr/local/bin; do
- if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then
- svnversion=${dir}/svnversion
- fi
- if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
- p4_cmd=${dir}/p4
- fi
+for svncmd in svnliteversion svnversion; do
+ for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/${svncmd}" ] && [ -z ${svnversion} ] ; then
+ svnversion=${dir}/${svncmd}
+ fi
+ if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
+ p4_cmd=${dir}/p4
+ fi
+ done
done
+
if [ -d "${SYSDIR}/../.git" ] ; then
for dir in /bin /usr/bin /usr/local/bin; do
if [ -x "${dir}/git" ] ; then
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306210603.r5L63nk2093497>