X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=c6f91fa39071c7d4d1b968af704d9818d304d4b8;hb=c5624ba39fa032cda30698121bb8775640edb965;hp=a1e57dff56d677e2b8679d268170e9ae0d76ada4;hpb=19df4611c634f48c2ea0d321083e55bd0a2eeae4;p=grml-live.git

diff --git a/buildd/functions.sh b/buildd/functions.sh
index a1e57df..c6f91fa 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Thu Oct 25 22:40:45 CEST 2007 [mika]
+# Latest change: Die Okt 30 09:47:34 CET 2007 [mika]
 ################################################################################
 
 die() {
@@ -37,26 +37,31 @@ MUTT_HEADERS=$(mktemp)
 [ -n "$ISO_DIR" ]       || ISO_DIR=$STORAGE/grml-isos
 [ -n "$RECIPIENT" ]     || RECIPIENT=root@localhost
 [ -n "$ATTACHMENT" ]    || ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-[ -n "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/dirinstall/grml
-[ -n "$GRML_LOGFILES" ] || GRML_LOGFILES=/var/log/grml-live/
 [ -n "$FROM" ]          || FROM=root@localhost
 
-[ -d "$FAI_LOGFILES" ]  || mkdir -p $FAI_LOGFILES
-[ -d "$GRML_LOGFILES" ] || mkdir -p $GRML_LOGFILES
+if [ -n "$LOGFILE" ] ; then
+   GRML_LOGFILE="$LOGFILE"
+else
+   [ -n "$GRML_LOGFILE" ]  || GRML_LOGFILE=/var/log/grml-live.log
+fi
+
+[ -n "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/dirinstall/grml
 
 echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
 
 # execute grml-live:
 grml_live_run() {
-  if [ -f "$ISO_DIR/$ISO_NAME" ] ; then
-     echo "$ISO_DIR/$ISO_NAME exists already. Nothing to be done, exiting."
-     exit 0
+  if ! [ "$FORCE_REBUILD" = "1" ] ; then
+     if [ -f "$ISO_DIR/$ISO_NAME" ] ; then
+        echo "$ISO_DIR/$ISO_NAME exists already. Nothing to be done, exiting."
+        exit 0
+     fi
   fi
 
   grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
             -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
-            1>$GRML_LOGFILES/grml-buildd.stdout \
-            2>$GRML_LOGFILES/grml-buildd.stderr ; RC=$?
+            1>/var/log/grml-buildd.stdout \
+            2>/var/log/grml-buildd.stderr ; RC=$?
 
   if [ "$RC" = "0" ] ; then
      RC_INFO=success
@@ -67,7 +72,7 @@ grml_live_run() {
 
 # create log archive:
 create_logs() {
-  ( cd / && tar zcf $ATTACHMENT var/log/fai/dirinstall/grml 1>/dev/null )
+  ( cd / && tar zcf $ATTACHMENT var/log/fai/dirinstall/grml $GRML_LOGFILE 1>/dev/null )
 }
 
 # store information of ISO size:
@@ -87,13 +92,19 @@ $ISO_DETAILS
 
 Return code of grml-live run was: $RC
 
+$(grep 'Executed command line:' $GRML_LOGFILE || echo "* executed command line not available")
+
 The following errors have been noticed (several might be warnings only):
 
-$(grep error $FAI_LOGFILES/* | grep -ve liberror -ve libgpg-error || echo "* nothing")
+$(grep -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing")
 
 The following warnings have been noticed:
 
-$(grep warn $FAI_LOGFILES/* || echo "* nothing")
+$(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
+
+The following packages could not be installed:
+
+$(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")
 
 Find details in the attached logs." | \
   mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \