X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=a440d3a4c241970cf4c43619b3b5bf15a277bcd3;hp=471a126392e61b6bd409b1f17f1c920a880a9d2f;hb=3e18610b1a0891ed43156c6874842050fed002e6;hpb=9bba4f868d5cbdde2f358cb156941331655752eb diff --git a/buildd/functions.sh b/buildd/functions.sh index 471a126..a440d3a 100755 --- a/buildd/functions.sh +++ b/buildd/functions.sh @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Dec 09 18:38:26 CET 2007 [mika] ################################################################################ die() { @@ -59,7 +58,7 @@ grml_live_run() { 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 \ + -g "$NAME-daily-$SUITE" -v $DATE -r grml-live-autobuild -i $ISO_NAME \ 1>/var/log/grml-buildd.stdout \ 2>/var/log/grml-buildd.stderr ; RC=$? @@ -78,8 +77,8 @@ create_logs() { # store logs on remote server: upload_logs() { [ -n "$RSYNC_MIRROR" ] || return 1 - umask 022 - rsync --exclude dmesg.log --times --partial -az --quiet /var/log/grml-buildd.* \ + umask 002 + rsync --exclude dmesg.log --times --partial --copy-links -az --quiet /var/log/grml-buildd.* \ $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/ } @@ -135,6 +134,9 @@ store_iso() { if [ -r "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.md5" ] ; then mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.md5" "${ISO_DIR}" fi + if [ -r "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.sha1" ] ; then + mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.sha1" "${ISO_DIR}" + fi fi }