svn commit: r364866 - projects/release-git/release

[Glen Barber]

Author: gjb
Date: Thu Aug 27 14:29:06 2020
New Revision: 364866
URL: https://svnweb.freebsd.org/changeset/base/364866

Log:
  Do not unconditionally build git from ports if it already exists.
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  projects/release-git/release/release.sh

Modified: projects/release-git/release/release.sh
==============================================================================
--- projects/release-git/release/release.sh	Thu Aug 27 13:38:20 2020	(r364865)
+++ projects/release-git/release/release.sh	Thu Aug 27 14:29:06 2020	(r364866)
@@ -265,7 +265,8 @@ extra_chroot_setup() {
 
 	# Install git from ports or packages if the ports tree is
 	# available and VCSCMD is unset.
-	if [ -d ${CHROOTDIR}/usr/ports ]; then
+	_gitcmd="$(which git)"
+	if [ -d ${CHROOTDIR}/usr/ports -a ! -z "${_gitcmd}" ]; then
 		# Trick the ports 'run-autotools-fixup' target to do the right
 		# thing.
 		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)