diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2024-03-29 07:10:50 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2024-03-29 07:12:52 +0000 |
| commit | 6baddb6b117664f51e2b1d2427fced946913a08f (patch) | |
| tree | 261cad992c5f86cf91203723ab7856a687eb13b9 /release | |
| parent | 3f2b9607756d0f92ca29c844db0718b313a06634 (diff) | |
Diffstat (limited to 'release')
| -rwxr-xr-x | release/release.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/release/release.sh b/release/release.sh index 75278a12daa6..c9d0203debd4 100755 --- a/release/release.sh +++ b/release/release.sh @@ -252,11 +252,11 @@ extra_chroot_setup() { cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} fi - if [ -z "${NOGIT}" ]; then - # Install git from ports or packages if the ports tree is - # available and VCSCMD is unset. - _gitcmd="$(which git)" - if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then + _gitcmd="$(which git)" + if [ -z "${NOGIT}" -a -z "${_gitcmd}" ]; then + # Install git from ports if the ports tree is available; + # otherwise install the pkg. + if [ -d ${CHROOTDIR}/usr/ports ]; then # Trick the ports 'run-autotools-fixup' target to do the right # thing. _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) |
