diff options
| author | gjb <gjb@FreeBSD.org> | 2015-05-06 14:48:35 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-05-06 14:48:35 +0000 |
| commit | 24430ad552453162b6dd3408812af5656a93c0de (patch) | |
| tree | 7720b9cb40fff8f6f063f11eb03dc46473cc4530 /release/release.sh | |
| parent | 71798e693e12ab68d587a110008c7225263fbd72 (diff) | |
| download | FreeBSD-src-24430ad552453162b6dd3408812af5656a93c0de.zip FreeBSD-src-24430ad552453162b6dd3408812af5656a93c0de.tar.gz | |
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
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/release/release.sh b/release/release.sh index 0674c2f..e35f917 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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/. |
