X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=0600dfa06dcec0bd9801c3e81a295cffde7c3ec4;hb=8e7b216f054d8d36ccef614fd83df4f83fcde3bc;hp=04d2eb14970f5c2522214cba383d410d1952155e;hpb=d88753b4aaae6b56bd8013ff3455ea144a908d67;p=grml-live.git

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 04d2eb1..0600dfa 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Filename:      /usr/share/grml-live/buildd/functions.sh
 # Purpose:       main function file for grml-live buildd
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -20,13 +20,14 @@ which mutt >/dev/null 2>&1 || die "mutt binary not found. Exiting."
 [ -n "$SUITE" ]    || die "\$SUITE is not set. Exiting."
 [ -n "$CLASSES" ]  || die "\$CLASSES is not set. Exiting."
 [ -n "$NAME" ]     || die "\$NAME is not set. Exiting."
-[ -n "$ISO_NAME" ] || die "\$ISO_NAME is not set. Exiting."
+[ -n "$PRODUCT_NAME" ] || die "\$PRODUCT_NAME is not set. Exiting."
 
 # some defaults:
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
 DATE=$(date +'%Y%m%d_%H%M%S')
 TMP_DIR="$(mktemp -d)"
 [ -n "$TMP_DIR" ]      || die "Could not create \$TMP_DIR. Exiting."
+ISO_NAME="${PRODUCT_NAME}.iso"
 
 # make sure we have same safe defaults:
 [ -n "$OUTPUT_DIR" ]    || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
@@ -66,10 +67,13 @@ grml_live_run() {
   grml_name="$NAME-daily-$CODENAME"
   shortdate="$(date +%y%m%d)"
 
+  TIME_START=$(date +%s)
   grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
             -g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \
-             >/var/log/grml-buildd.stdout \
-            2>/var/log/grml-buildd.stderr ; RC=$?
+             >/var/log/grml-buildd.stdout.log \
+            2>/var/log/grml-buildd.stderr.log ; RC=$?
+  TIME_END=$(date +%s)
+  WALLTIME=$(($TIME_END-$TIME_START))
 
   if [ "$RC" = "0" ] ; then
      RC_INFO=success
@@ -81,7 +85,7 @@ grml_live_run() {
 
 # create log archive:
 create_logs() {
-  ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null )
+  ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr.log /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null )
 }
 
 # store logs on remote server:
@@ -108,11 +112,12 @@ send_mail() {
   # attach logs only if we have some:
   [ -r "$ATTACHMENT" ] && MUTT_ATTACH="-a $ATTACHMENT" || MUTT_ATTACH=''
 
-  echo -en "Automatically generated mail by $SCRIPTNAME
+  echo "Automatically generated mail by $SCRIPTNAME
 
 $ISO_DETAILS
 
-Return code of grml-live run was: $RC
+Return code of grml-live was: $RC
+Time: $WALLTIME
 
 $(grep -A2 'Executed grml-live' $GRML_LOGFILE || echo "* executed grml-live command line not available")
 
@@ -120,7 +125,11 @@ $(grep -A2 'Executed FAI' $GRML_LOGFILE || echo "* executed FAI command line not
 
 The following errors have been noticed (several might be warnings only):
 
-$(grep -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing")
+$(grep -i error $FAI_LOGFILES/*.log /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error -ve libcomerr -ve 'no errors found' || echo "* nothing")
+
+The following errors have been noticed in FAI scripts:
+
+$(grep -B2 "FAILED with exit code" $FAI_LOGFILES/* | echo "* nothing")
 
 The following warnings have been noticed:
 
@@ -138,7 +147,7 @@ See attached files for further details.
 
 EOF" | \
   mutt -e "my_hdr From: grml-live autobuild daemon <$FROM>" -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
-       -a /var/log/grml-buildd.stderr $MUTT_ATTACH -- "$RECIPIENT"
+       -a /var/log/grml-buildd.stderr.log $MUTT_ATTACH -- "$RECIPIENT"
 }
 
 # make sure we store the final iso: