aboutsummaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorlinimon <linimon@FreeBSD.org>2010-06-26 07:31:11 +0800
committerlinimon <linimon@FreeBSD.org>2010-06-26 07:31:11 +0800
commit6fa1a94c27d2641f99124235613cfd73b24bf8dd (patch)
tree3856c763f4d55c470b793cc0dd2c5566da96ba86 /Tools
parent96b7d083e0ee625caa929b346e7c150777bea8db (diff)
downloadfreebsd-ports-graphics-6fa1a94c27d2641f99124235613cfd73b24bf8dd.tar.gz
freebsd-ports-graphics-6fa1a94c27d2641f99124235613cfd73b24bf8dd.tar.zst
freebsd-ports-graphics-6fa1a94c27d2641f99124235613cfd73b24bf8dd.zip
Generalize the packge building scripts to be able to be run on more than
one 'head' node, rather than just pointyhat itself. Constants are factored out into installation-specific files known as portbuild/conf/server.conf and portbuild/conf/client.conf. There is only one server.conf file. Individual <arch> directories may have their own client.conf files, or may symlink to ../conf/client.conf. While here, fix error messages displayed on new runs. Feature safe: yes
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/portbuild/scripts/processfail11
1 files changed, 8 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/processfail b/Tools/portbuild/scripts/processfail
index 6246c76863e..e563a74ce02 100755
--- a/Tools/portbuild/scripts/processfail
+++ b/Tools/portbuild/scripts/processfail
@@ -6,8 +6,10 @@ arch=$1
branch=$2
pb=/var/portbuild
+. ${pb}/conf/server.conf
-of=/usr/local/www/data/errorlogs/.${arch}-${branch}-failure.html
+ERRORLOGS_DIRECTORY="${WWW_DIRECTORY}/errorlogs"
+of=${ERRORLOGS_DIRECTORY}/.${arch}-${branch}-failure.html
cd ${pb}/${arch}/${branch}
@@ -16,7 +18,10 @@ if [ -e .newfailure.stamp -a $(echo $(find . -maxdepth 1 -newer .newfailure.stam
touch .newfailure.stamp
newfailure=${pb}/${arch}/${branch}/newfailure
-num=$(wc -l ${newfailure} | awk '{print $1}')
+num=0
+if [ -e ${newfailure} ]; then
+ num=$(wc -l ${newfailure} | awk '{print $1}')
+fi
header() {
echo "<html><head><title>New package building errors</title>" >$of
@@ -75,4 +80,4 @@ while read dir name ver date last count; do
echo "</tr>" >> $of
done < newfailure
footer ""
-mv -f $of /usr/local/www/data/errorlogs/${arch}-${branch}-failure.html
+mv -f $of ${ERRORLOGS_DIRECTORY}/${arch}-${branch}-failure.html