--- misc/scripts/shell/cvslog.sh	2001/03/09 00:23:22	1.1
+++ misc/scripts/shell/cvslog.sh	2005/04/03 23:43:21	1.12
@@ -1,34 +1,25 @@
 #!/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
 
-# destination address
-ADDRESS="dev@i-scream.org.uk"
+# e-mail addresses
+TOADDR="commits@i-scream.org"
+FROMADDR="commits@i-scream.org"
 
 # cvs path
-CVS="/home/cut/tdb1/bin/cvs"
+CVS="/usr/bin/cvs"
 
 # cvs repository
-CVSROOT="/usr/local/proj/co600_10/cvs"
+CVSROOT="/cvs/i-scream"
 
 # temporary checkout directory (checked out modules already)
-CHECKOUTDIR="/home/cut/tdb1/cvsscripttemp"
+CHECKOUTDIR="/tmp/i-scream/cvstmp"
 
 # path to cvs2cl
-CVS2CLPATH="/home/cut/tdb1/bin/cvs2cl"
+CVS2CLPATH="/usr/local/bin/cvs2cl"
 
 # command line args for cvs2cl
-CVS2CLARGS="-w -r -b -t -U ${CVSROOT}/CVSROOT/users -l \"-dyesterday<today\" -g \"-d/usr/local/proj/co600_10/cvs\" -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
 CVS2CL="${CVS2CLPATH} ${CVS2CLARGS}"
@@ -36,19 +27,33 @@ CVS2CL="${CVS2CLPATH} ${CVS2CLARGS}"
 # subject line
 SUBJECT="i-scream daily commit logs - "
 
+# full cvs update script
+FULLCVSUPDATE="/home/iscream/bin/fullcvsupdate.sh"
 
+# path to sendmail
+SENDMAIL="/usr/sbin/sendmail"
+
+# cvslog webpage for this day :)
+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
 
-cd ${CHECKOUTDIR}
-${CVS} -d ${CVSROOT} -Q update -d
+${FULLCVSUPDATE} >/dev/null 2>&1
 
-MODULES="CVSROOT documentation experimental misc source web"
+MODULES=`ls ${CVSROOT}`
 
-for MOD in ${MODULES}; do
+cd ${CHECKOUTDIR}
 
-    ${CVS2CL} ${MOD}
+for MODULE in ${MODULES}; do
+
+    ${CVS2CL} ${MODULE}
     if test -r "ChangeLog"; then \
-        cat ChangeLog | mailx -s "${SUBJECT}${MOD}" ${ADDRESS}; \
+        ( echo "To: ${TOADDR}"; echo "From: ${FROMADDR}"; \
+          echo "Subject: ${SUBJECT}${MODULE}"; echo ${CVSLOGLINE}${MODULE}; \
+          echo; echo; cat ChangeLog; \
+          echo "." ) | ${SENDMAIL} ${TOADDR}; \
         rm -f ChangeLog
     fi;