From e66d06e8e3e613e16a406a051f77a4f323e70014 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 19 Jun 2008 15:31:04 +0000 Subject: Only print "Build completed" if build was successful. Print the time at which at step was finished (along with the time it took to complete). /trunk/scripts/functions | 7 5 2 0 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/functions b/scripts/functions index 0e73143..8feba43 100644 --- a/scripts/functions +++ b/scripts/functions @@ -120,7 +120,9 @@ CT_DoEnd() local level="$1" CT_STOP_DATE=$(CT_DoDate +%s%N) CT_STOP_DATE_HUMAN=$(CT_DoDate +%Y%m%d.%H%M%S) - CT_DoLog "${level:-INFO}" "Build completed at ${CT_STOP_DATE_HUMAN}" + if [ "${level}" = "ERROR" ]; then + CT_DoLog "${level:-INFO}" "Build completed at ${CT_STOP_DATE_HUMAN}" + fi elapsed=$((CT_STOP_DATE-CT_STAR_DATE)) elapsed_min=$((elapsed/(60*1000*1000*1000))) elapsed_sec=$(printf "%02d" $(((elapsed%(60*1000*1000*1000))/(1000*1000*1000)))) @@ -206,10 +208,11 @@ CT_DoStep() { CT_EndStep() { local stop=$(CT_DoDate +%s%N) local duration=$(printf "%032d" $((stop-${CT_STEP_START[${CT_STEP_COUNT}]})) |sed -r -e 's/([[:digit:]]{2})[[:digit:]]{7}$/\.\1/; s/^0+//; s/^\./0\./;') + local elapsed=$(printf "%02d:%02d" $((SECONDS/60)) $((SECONDS%60))) local level="${CT_STEP_LEVEL[${CT_STEP_COUNT}]}" local message="${CT_STEP_MESSAGE[${CT_STEP_COUNT}]}" CT_STEP_COUNT=$((CT_STEP_COUNT-1)) - CT_DoLog "${level}" "${message}: done in ${duration}s" + CT_DoLog "${level}" "${message}: done in ${duration}s (at ${elapsed})" return 0 } -- cgit v0.10.2-6-g49f6