Move PATH and export to the same line.

Handle svn or svnlite being installed in /usr/bin or
/usr/local/bin.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-05-06 14:48:35 +00:00
parent a12fa24967
commit 5dbf38dcca

View File

@ -36,8 +36,7 @@
# $FreeBSD$
#
PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
export PATH
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
VERSION=2
@ -60,7 +59,13 @@ env_setup() {
RELENGDIR="$(realpath $(dirname $(basename ${0})))"
# The default version control system command to obtain the sources.
VCSCMD="svn checkout"
for _dir in /usr/bin /usr/local/bin; do
for _svn in svn svnlite; do
[ -x "${_dir}/${_svn}" ] && VCSCMD="${_dir}/${_svn}"
[ ! -z "${VCSCMD}" ] && break 2
done
done
VCSCMD="${VCSCMD} checkout"
# The default svn checkout server, and svn branches for src/, doc/,
# and ports/.