Author: gjb
Date: Fri Sep 11 17:05:09 2020
New Revision: 365639
URL: https://svnweb.freebsd.org/changeset/base/365639
Log:
Fix indentation following r365638. No functional changes.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh Fri Sep 11 17:04:09 2020 (r365638)
+++ head/release/release.sh Fri Sep 11 17:05:09 2020 (r365639)
@@ -276,31 +276,31 @@ extra_chroot_setup() {
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
- # Trick the ports 'run-autotools-fixup' target to do the right
- # thing.
- _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
- REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V
REVISION)
- BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
- UNAME_r=${REVISION}-${BRANCH}
- GITUNSETOPTS="CONTRIB CURL CVS GITWEB GUI HTMLDOCS"
- GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
- GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
- GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
- eval chroot ${CHROOTDIR} env OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
- make -C /usr/ports/devel/git FORCE_PKG_REGISTER=1 \
- WRKDIRPREFIX=/tmp/ports \
- DISTDIR=/tmp/distfiles \
- install clean distclean
- else
- eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
- pkg install -y devel/git
- eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
- pkg clean -y
- fi
+ # 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
+ # Trick the ports 'run-autotools-fixup' target to do
the right
+ # thing.
+ _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release
-V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release
-V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
+ GITUNSETOPTS="CONTRIB CURL CVS GITWEB GUI HTMLDOCS"
+ GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
+ GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
+ GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
+ eval chroot ${CHROOTDIR} env
OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
+ make -C /usr/ports/devel/git
FORCE_PKG_REGISTER=1 \
+ WRKDIRPREFIX=/tmp/ports \
+ DISTDIR=/tmp/distfiles \
+ install clean distclean
+ else
+ eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
+ pkg install -y devel/git
+ eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
+ pkg clean -y
+ fi
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
# Trick the ports 'run-autotools-fixup' target to do the right
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
