diff options
author | gjb <gjb@FreeBSD.org> | 2013-07-02 10:36:57 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2013-07-02 10:36:57 +0000 |
commit | 4acdfaf6db70506eb658f207e17d89d858e0eec0 (patch) | |
tree | dc7c4622581638ac4548ee592ff49975d83f7d75 /sys/conf | |
parent | 1920a78bd9f7cd682b5a89413e962d7c093b7444 (diff) | |
download | FreeBSD-src-4acdfaf6db70506eb658f207e17d89d858e0eec0.zip FreeBSD-src-4acdfaf6db70506eb658f207e17d89d858e0eec0.tar.gz |
- Update newvers.sh to include svn revision in uname(1) if the
system has svnliteversion.
- If svnliteversion is not found, look for svnversion in /usr/bin
and /usr/local/bin, since svnlite can be installed as svn if
WITH_SVN is set.[1]
- Remove /bin from binary search paths.[1]
Discussed with: kib [1]
MFC after: 3 days
Approved by: kib (mentor)
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/newvers.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 1e5e24b..b0ca002 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -88,16 +88,26 @@ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date` 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 /usr/bin/svnliteversion ] ; then + svnversion=/usr/bin/svnliteversion +fi + +for dir in /usr/bin /usr/local/bin; do + if [ ! -z "${svnversion}" ] ; then + break + fi if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then svnversion=${dir}/svnversion + break fi +done +for dir in /usr/bin /usr/local/bin; do if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then p4_cmd=${dir}/p4 fi done if [ -d "${SYSDIR}/../.git" ] ; then - for dir in /bin /usr/bin /usr/local/bin; do + for dir in /usr/bin /usr/local/bin; do if [ -x "${dir}/git" ] ; then git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" break |