aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-08-27 14:29:06 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-08-27 14:29:06 +0000
commiteade35355142bdca47a168c7ef5f7ea766467fe7 (patch)
tree7c0875a659447a1d9d82429372754eb06540beee /release
parent6e7be14e7f1f2e1fbb6322d016b8a0ab062578e6 (diff)
downloadsrc-eade35355142bdca47a168c7ef5f7ea766467fe7.tar.gz
src-eade35355142bdca47a168c7ef5f7ea766467fe7.zip
Do not unconditionally build git from ports if it already exists.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes: svn path=/projects/release-git/; revision=364866
Diffstat (limited to 'release')
-rwxr-xr-xrelease/release.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh
index 185a7d08c235..47b868dbcf9c 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -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)