From 5f5622f0f6ad9f2b4279ba16cd5cad3b263bbdef Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Tue, 9 Sep 2014 12:12:09 +0000 Subject: [PATCH] Update the webupdate.wrapper to match the running version: - Don't assume or hard-code PORTSDIR is in /usr. - Set PINDEX_OVERRIDE based on the running OSVERSION. - Fetch the ports/INDEX file if ENOENT. - Group all exported variables together. Sponsored by: The FreeBSD Foundation --- share/tools/webupdate.wrapper | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/share/tools/webupdate.wrapper b/share/tools/webupdate.wrapper index cb565b7dc0..d09dcb89cf 100755 --- a/share/tools/webupdate.wrapper +++ b/share/tools/webupdate.wrapper @@ -12,20 +12,22 @@ SVNROOT=svn://svn.FreeBSD.org PUBDIR=/usr/local/www/www.freebsd.org DESTDIR="${PUBDIR}-clean" RSYNC_FLAGS="-avH" -PINDEX_OVERRIDE=/usr/ports/INDEX-9 GEN_INDEX=yes -export USER=www-data -export PATH DESTDIR PINDEX_OVERRIDE GEN_INDEX PUBDIR - WEBMAILTO=freebsd-doc@FreeBSD.org -export WEBMAILTO - FLAGDIR=/usr/local/www/build - -# We always build these - they are fast +: ${PORTSDIR:=/usr/local/www/ports}; export PORTSDIR +: ${INDEXNUM:=$(make -C ${PORTSDIR} -V OSREL)} +: ${PINDEX_OVERRIDE:=${PORTSDIR}/INDEX-${INDEXNUM%%.*}} +export USER=www-data +export PATH DESTDIR PINDEX_OVERRIDE GEN_INDEX PUBDIR PORTSDIR +export WEBMAILTO export WITH_PORTS_GROWTH=YES export WITH_PRSTATS=YES +if [ ! -e "${PINDEX_OVERRIDE}" ]; then + make -C ${PORTSDIR} fetchindex +fi + # Flags are ordered by more extensive to less if [ -e $FLAGDIR/fullbuild-clean.flag ]; then export BUILD_RELNOTES=YES