svn commit: r282541 - projects/release-arm-redux/release

[Glen Barber]

Author: gjb
Date: Wed May  6 14:48:35 2015
New Revision: 282541
URL: https://svnweb.freebsd.org/changeset/base/282541

Log:
  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

Modified:
  projects/release-arm-redux/release/release.sh

Modified: projects/release-arm-redux/release/release.sh
==============================================================================
--- projects/release-arm-redux/release/release.sh	Wed May  6 14:35:43 2015	(r282540)
+++ projects/release-arm-redux/release/release.sh	Wed May  6 14:48:35 2015	(r282541)
@@ -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/.