--- misc/scripts/shell/cvslog.sh	2003/09/27 17:21:31	1.10
+++ misc/scripts/shell/cvslog.sh	2004/08/01 10:39:52	1.11
@@ -1,20 +1,10 @@
 #!/bin/sh
 
-#---------------------------------------------------------
-# cvslog.sh
-#
-# Script to send daily cvslog e-mails.
-# Written by Tim Bishop [tdb1@ukc.ac.uk] 26/01/2001
-#
-# Copyright i-Scream, 2000
-# http://www.i-scream.org.uk
-#---------------------------------------------------------
-
 ## settings
 
 # e-mail addresses
-TOADDR="commits@i-scream.org.uk"
-FROMADDR="commits@i-scream.org.uk"
+TOADDR="commits@i-scream.org"
+FROMADDR="commits@i-scream.org"
 
 # cvs path
 CVS="/usr/bin/cvs"
@@ -23,13 +13,12 @@ CVS="/usr/bin/cvs"
 CVSROOT="/cvs/i-scream"
 
 # temporary checkout directory (checked out modules already)
-CHECKOUTDIR="/home/sites/www.i-scream.org.uk/cvsscripttemp"
+CHECKOUTDIR="/tmp/i-scream/cvstmp"
 
 # path to cvs2cl
-CVS2CLPATH="/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl"
+CVS2CLPATH="/usr/local/bin/cvs2cl"
 
 # command line args for cvs2cl
-#CVS2CLARGS="-w -r -b -t -U ${CVSROOT}/CVSROOT/users -l \"-dyesterday<today\" -g \"-d${CVSROOT}\" -g \"-Q\""
 CVS2CLARGS="--no-wrap --no-common-dir -w -r -t -S -U ${CVSROOT}/CVSROOT/users -l \"-dyesterday<today\" -g \"-d${CVSROOT}\" -g \"-Q\""
 
 # cvs2cl command
@@ -39,14 +28,14 @@ CVS2CL="${CVS2CLPATH} ${CVS2CLARGS}"
 SUBJECT="i-scream daily commit logs - "
 
 # full cvs update script
-FULLCVSUPDATE="/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh"
+FULLCVSUPDATE="/home/iscream/bin/fullcvsupdate.sh"
 
 # path to sendmail
 SENDMAIL="/usr/sbin/sendmail"
 
 # cvslog webpage for this day :)
-DATE=`/bin/date --date="1 day ago" "+%Y/%m/%d"`
-CVSLOGURL="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=date&date=${DATE}&module="
+DATE=`/bin/date -v-1d +%Y/%m/%d`
+CVSLOGURL="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=date&date=${DATE}&module="
 CVSLOGLINE="This log is viewable online at ${CVSLOGURL}"
 
 ## code