User: user57
Date: 01/08/31 18:31:41
Modified: src/bin catchlog.sh nightly-website.sh
Log:
o minor logging updates, default to --quiet so we don't loose any logs
from tee.
o moved bomb to manual
Revision Changes Path
1.2 +8 -1 newsite/src/bin/catchlog.sh
Index: catchlog.sh
===================================================================
RCS file: /cvsroot/jboss/newsite/src/bin/catchlog.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catchlog.sh 2001/09/01 00:25:30 1.1
+++ catchlog.sh 2001/09/01 01:31:40 1.2
@@ -6,7 +6,7 @@
## ##
### ====================================================================== ###
-# $Id: catchlog.sh,v 1.1 2001/09/01 00:25:30 user57 Exp $
+# $Id: catchlog.sh,v 1.2 2001/09/01 01:31:40 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
@@ -120,17 +120,24 @@
if [ ! -f "$logfile" ]; then
touch $logfile
fi
+ echo "Opened log: `date`" >> $logfile
# execute the program
if [ "x$quiet" = "x" ]; then
# use tee and let output display to the console
$args | $TEE $append $logfile 2>&1
+ status=$?
else
# append all output to the log, nothing goes to console
$args >> $logfile 2>&1
+ status=$?
fi
+ # try to get file to flush
+ echo "Closing log: `date`" >> $logfile
info "Log saved to $logfile"
+
+ exit $status
}
##
1.2 +6 -11 newsite/src/bin/nightly-website.sh
Index: nightly-website.sh
===================================================================
RCS file: /cvsroot/jboss/newsite/src/bin/nightly-website.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nightly-website.sh 2001/09/01 00:25:30 1.1
+++ nightly-website.sh 2001/09/01 01:31:40 1.2
@@ -5,15 +5,11 @@
## ##
### ====================================================================== ###
-# $Id: nightly-website.sh,v 1.1 2001/09/01 00:25:30 user57 Exp $
+# $Id: nightly-website.sh,v 1.2 2001/09/01 01:31:40 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
-# Setup Mail
-MAIL="mail"
-MAILTO="[EMAIL PROTECTED]" # change to [EMAIL PROTECTED] when done testing
-
# Where the required scripts live
SCRIPTROOT="$DIRNAME"
@@ -21,14 +17,13 @@
DSTAMP=`date +%m%d%Y`
# Where the logs will go
-LOGROOT="$HOME/log"
-LOGFILE="$LOGROOT/nightly-website.log"
+LOGFILE="$HOME/log/nightly-website.log"
# Run the update-website.sh script. It must be wrapped with catchlog.sh,
# because it uses the log file to determine build successes from it
-$SCRIPTROOT/catchlog.sh --logfile $LOGFILE -- \
+$SCRIPTROOT/catchlog.sh \
+ --quiet \
+ --logfile $LOGFILE \
+ -- \
$SCRIPTROOT/update-website.sh $LOGFILE
-
-# Send out email about the update
-$MAIL $MAILTO -s "Website updated successfully" < $LOGFILE
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
