From 8029ff6a8e9bc1dbec8d1e5f8694a4daab3c5607 Mon Sep 17 00:00:00 2001 From: arpinux Date: Wed, 30 Jun 2021 15:55:17 +0200 Subject: [PATCH] mise en forme du log + fix lb clean final --- DFbuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/DFbuild b/DFbuild index 8c9c2a9..89db5cd 100755 --- a/DFbuild +++ b/DFbuild @@ -4,7 +4,7 @@ # set working directory ------------------------------------------------ DFDIR="$(realpath "$(dirname "$0")")" -cd ${DFDIR} +cd ${DFDIR} # cfg ------------------------------------------------------------------ VERSION="11.0-alpha" LOG="dfiso.log" @@ -33,7 +33,11 @@ fi lb clean ## mise en place -echo "INFO: building DFiso-${VERSION}-${ARCH}" | tee -a ${LOG} +echo -e "----\nbuilding DFiso-${VERSION}-${ARCH}" > ${LOG} +echo -e "$(date)" >> ${LOG} +echo -e "system: $(uname -a)" >> ${LOG} +echo -e "tools: live-build-$(lb -v) - Debian-$(cat /etc/debian_version)" >> ${LOG} +echo "----" CONFIG=() # utiliser apt-cacher s'il est installé @@ -69,11 +73,13 @@ if test -f live-image-${ARCH}.hybrid.iso; then mv dfiso.log ${ISODIR}/${NAME}.log cd ${ISODIR} && md5sum ${NAME}.iso > ${NAME}.md5 echo "INFO: nettoyage" + cd ${DFDIR} lb clean echo "Opération achevée en $(($SECONDS/60)) minutes" + exit 0 else echo "ISO non construite : erreur, voir le fichier dfiso.log" exit 1 fi -exit 0 +## eof