- 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)
This commit is contained in:
parent
92a0637f73
commit
92994bd3ba
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=252505
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user