Adjust grml-buildd for new logdir structure

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

diff --git a/buildd/functions.sh b/buildd/functions.sh
index b8fb210..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:
@@ -104,7 +104,7 @@ $(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")
+$(grep -i "Not Installed" $FAI_LOGFILES/software.log || echo "* nothing")
 
 The following packages could not be installed: