diff options
| -rwxr-xr-x | share/tools/webupdate | 7 | ||||
| -rwxr-xr-x | share/tools/webupdate.wrapper | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/share/tools/webupdate b/share/tools/webupdate index 090448358b..31de593f0e 100755 --- a/share/tools/webupdate +++ b/share/tools/webupdate @@ -138,12 +138,11 @@ if [ $cond ]; then svn co $SVNROOT/base/stable/9/share/man/man4 relnotes9/man4 >> $LOGFILE 2>&1 || exit 2; svn co $SVNROOT/base/stable/8/release/doc relnotes8/doc >> $LOGFILE 2>&1 || exit 2; svn co $SVNROOT/base/stable/8/share/man/man4 relnotes8/man4 >> $LOGFILE 2>&1 || exit 2; - svn co --depth immediates $SVNROOT/ports/head ports + svn co --depth immediates $SVNROOT/ports/head ports >> $LOGFILE 2>&1 || exit 2 + svn up --set-depth infinity ports/Mk >> $LOGFILE 2>&1 || exit 2 rm -f $BUILDDIR/fullbuild-clean.flag else - for dir in head relnotes/doc relnotes/man4 ports relnotes10/doc \ - relnotes10/man4 relnotes9/doc relnotes9/man4 relnotes8/doc \ - relnotes8/man4; do + for dir in ${subtrees}; do svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; done diff --git a/share/tools/webupdate.wrapper b/share/tools/webupdate.wrapper index d09dcb89cf..413c3f5520 100755 --- a/share/tools/webupdate.wrapper +++ b/share/tools/webupdate.wrapper @@ -15,7 +15,7 @@ RSYNC_FLAGS="-avH" GEN_INDEX=yes WEBMAILTO=freebsd-doc@FreeBSD.org FLAGDIR=/usr/local/www/build -: ${PORTSDIR:=/usr/local/www/ports}; export PORTSDIR +: ${PORTSDIR:=/usr/local/www/build/ports}; export PORTSDIR : ${INDEXNUM:=$(make -C ${PORTSDIR} -V OSREL)} : ${PINDEX_OVERRIDE:=${PORTSDIR}/INDEX-${INDEXNUM%%.*}} export USER=www-data @@ -25,6 +25,7 @@ export WITH_PORTS_GROWTH=YES export WITH_PRSTATS=YES if [ ! -e "${PINDEX_OVERRIDE}" ]; then + [ -e ${PORTSDIR}/INDEX-${INDEXNUM} ] && rm -f ${PORTSDIR}/INDEX-${INDEXNUM} make -C ${PORTSDIR} fetchindex fi |