Adjust grml-buildd for new logdir structure

[grml-live.git] / buildd / functions.sh

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 8bdbd1a..7b979bc 100755 (executable)
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -45,7 +45,7 @@ else
    [ -n "$GRML_LOGFILE" ]  || GRML_LOGFILE=/var/log/grml-live.log
 fi
 
-[ -n "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/dirinstall/grml
+[ -n "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/grml/last
 
 echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
 
@@ -72,7 +72,7 @@ grml_live_run() {
 
 # create log archive:
 create_logs() {
-  ( cd / && tar zcf $ATTACHMENT var/log/fai/dirinstall/grml $GRML_LOGFILE 1>/dev/null )
+  ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES $GRML_LOGFILE 1>/dev/null )
 }
 
 # store information of ISO size:
@@ -92,6 +92,8 @@ $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 -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing")
@@ -100,6 +102,14 @@ The following warnings have been noticed:
 
 $(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
 
+There following dependency problems have been noticed:
+
+$(grep -i "Not Installed" $FAI_LOGFILES/software.log || 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" \
        -a $ATTACHMENT \