Fix indentation following r365638. No functional changes.
Sponsored by: Rubicon Communications, LLC (netgate.com)
This commit is contained in:
parent
91ce469984
commit
c71c2b76aa
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=365639
@ -276,31 +276,31 @@ extra_chroot_setup() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${NOGIT}" ]; then
|
if [ -z "${NOGIT}" ]; then
|
||||||
# Install git from ports or packages if the ports tree is
|
# Install git from ports or packages if the ports tree is
|
||||||
# available and VCSCMD is unset.
|
# available and VCSCMD is unset.
|
||||||
_gitcmd="$(which git)"
|
_gitcmd="$(which git)"
|
||||||
if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then
|
if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then
|
||||||
# Trick the ports 'run-autotools-fixup' target to do the right
|
# Trick the ports 'run-autotools-fixup' target to do the right
|
||||||
# thing.
|
# thing.
|
||||||
_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
|
_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
|
||||||
REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
|
REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
|
||||||
BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
|
BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
|
||||||
UNAME_r=${REVISION}-${BRANCH}
|
UNAME_r=${REVISION}-${BRANCH}
|
||||||
GITUNSETOPTS="CONTRIB CURL CVS GITWEB GUI HTMLDOCS"
|
GITUNSETOPTS="CONTRIB CURL CVS GITWEB GUI HTMLDOCS"
|
||||||
GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
|
GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
|
||||||
GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
|
GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
|
||||||
GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
|
GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
|
||||||
eval chroot ${CHROOTDIR} env OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
|
eval chroot ${CHROOTDIR} env OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
|
||||||
make -C /usr/ports/devel/git FORCE_PKG_REGISTER=1 \
|
make -C /usr/ports/devel/git FORCE_PKG_REGISTER=1 \
|
||||||
WRKDIRPREFIX=/tmp/ports \
|
WRKDIRPREFIX=/tmp/ports \
|
||||||
DISTDIR=/tmp/distfiles \
|
DISTDIR=/tmp/distfiles \
|
||||||
install clean distclean
|
install clean distclean
|
||||||
else
|
else
|
||||||
eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
|
eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
|
||||||
pkg install -y devel/git
|
pkg install -y devel/git
|
||||||
eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
|
eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
|
||||||
pkg clean -y
|
pkg clean -y
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -d ${CHROOTDIR}/usr/ports ]; then
|
if [ -d ${CHROOTDIR}/usr/ports ]; then
|
||||||
# Trick the ports 'run-autotools-fixup' target to do the right
|
# Trick the ports 'run-autotools-fixup' target to do the right
|
||||||
|
Loading…
Reference in New Issue
Block a user