aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-06 14:48:35 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-06 14:48:35 +0000
commit5dbf38dccac443520f1265b8ee5642a47bbcd008 (patch)
tree7720b9cb40fff8f6f063f11eb03dc46473cc4530 /release/release.sh
parenta12fa24967c5d53433d728392e91e8c67a3a6766 (diff)
downloadsrc-5dbf38dccac443520f1265b8ee5642a47bbcd008.tar.gz
src-5dbf38dccac443520f1265b8ee5642a47bbcd008.zip
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
Notes
Notes: svn path=/projects/release-arm-redux/; revision=282541
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/release/release.sh b/release/release.sh
index 0674c2fa08f6..e35f917965df 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/.