1.1 --- a/scripts/functions Sat May 19 13:10:11 2007 +0000
1.2 +++ b/scripts/functions Tue May 22 20:36:05 2007 +0000
1.3 @@ -12,7 +12,7 @@
1.4 for((depth=2; ${BASH_LINENO[$((${depth}-1))]}>0; depth++)); do
1.5 CT_DoLog ERROR " called from \"${BASH_SOURCE[${depth}]}\" at line # ${BASH_LINENO[${depth}-1]} in function \"${FUNCNAME[${depth}]}\""
1.6 done
1.7 - CT_DoLog ERROR "Look at \"${CT_ACTUAL_LOG_FILE}\" for more info on this error."
1.8 + [ "${CT_LOG_TO_FILE}" = "y" ] && CT_DoLog ERROR "Look at \"${CT_LOG_FILE}\" for more info on this error."
1.9 CT_STEP_COUNT=1
1.10 CT_DoEnd ERROR
1.11 exit $ret
1.12 @@ -54,30 +54,31 @@
1.13 cat -
1.14 else
1.15 echo "${1}"
1.16 - fi |( IFS="\n" # We want the full lines, even leading spaces
1.17 + fi |( offset=$((`CT_DoDate +%s`+(CT_STAR_DATE/(1000*1000*1000))))
1.18 + IFS="\n" # We want the full lines, even leading spaces
1.19 CT_PROG_BAR_CPT=0
1.20 indent=$((2*CT_STEP_COUNT))
1.21 while read line; do
1.22 case "${CT_LOG_SEE_TOOLS_WARN},${line}" in
1.23 y,*"warning:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
1.24 + y,*"WARNING:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
1.25 *"error:"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
1.26 *"make["?*"]:"*"Stop.") cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
1.27 *) cur_L="${LEVEL}"; cur_l="${level}";;
1.28 esac
1.29 l="`printf \"[%-5s]%*s%s%s\" \"${cur_L}\" \"${indent}\" \" \" \"${line}\"`"
1.30 # There will always be a log file, be it /dev/null
1.31 - echo -e "${l}" >>"${CT_ACTUAL_LOG_FILE}"
1.32 + echo -e "${l}"
1.33 if [ ${cur_l} -le ${max_level} ]; then
1.34 - echo -e "\r${l}"
1.35 + echo -e "\r${l}" >&6
1.36 fi
1.37 if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then
1.38 - str=`CT_DoDate +%s`
1.39 - elapsed=$((str-(CT_STAR_DATE/(1000*1000*1000))))
1.40 + elapsed=$((SECONDS+OFFSET))
1.41 [ ${CT_PROG_BAR_CPT} -eq 0 ] && bar="/"
1.42 [ ${CT_PROG_BAR_CPT} -eq 10 ] && bar="-"
1.43 [ ${CT_PROG_BAR_CPT} -eq 20 ] && bar="\\"
1.44 [ ${CT_PROG_BAR_CPT} -eq 30 ] && bar="|"
1.45 - printf "\r[%02d:%02d] %s " $((elapsed/60)) $((elapsed%60)) "${bar}"
1.46 + printf "\r[%02d:%02d] %s " $((elapsed/60)) $((elapsed%60)) "${bar}" >&6
1.47 CT_PROG_BAR_CPT=$(((CT_PROG_BAR_CPT+1)%40))
1.48 fi
1.49 done