diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-06-24 15:41:33 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-06-24 15:41:33 +0000 |
| commit | de2755b6812f103e08e081819abb10cc934129f1 (patch) | |
| tree | 2be0e25af38474e47476bc56ff4c5657afd694ce /share/tools/webupdate.wrapper | |
| parent | 4596aec97cf13caf7558c5d3cb46e789579e7b9e (diff) | |
Update webupdate and webupdate.wrapper to fix several issues.
In webupdate:
- Output the ports tree checkout to the log file.
- Set the depth of ports/Mk/ to 'infinity', since its contents
are needed for 'fetchindex' to work properly.
- Reduce redundant explicit paths to use the value of 'subdirs'.
In webupdate.wrapper:
- Set PORTSDIR to the actual path that is being updated by
webupdate.
- If PINDEX_OVERRIDE is set, remove the INDEX-INDEXNUM file.
Approved by: doceng (implicit)
Sponsored by: The FreeBSD Foundation
Notes
svn path=/head/; revision=46863
Diffstat (limited to 'share/tools/webupdate.wrapper')
| -rwxr-xr-x | share/tools/webupdate.wrapper | 3 |
1 files changed, 2 insertions, 1 deletions
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 |