1.1 --- a/scripts/functions Tue May 08 20:41:08 2007 +0000
1.2 +++ b/scripts/functions Wed May 09 13:11:04 2007 +0000
1.3 @@ -75,7 +75,7 @@
1.4 else
1.5 echo "${1}"
1.6 fi |( IFS="\n" # We want the full lines, even leading spaces
1.7 - cpt=0
1.8 + CT_PROG_BAR_CPT=0
1.9 indent=$((2*CT_STEP_COUNT))
1.10 while read line; do
1.11 case "${CT_LOG_SEE_TOOLS_WARN},${line}" in
1.12 @@ -91,9 +91,16 @@
1.13 normal="CT_NORMAL_COLOR"
1.14 if [ ${cur_l} -le ${max_level} ]; then
1.15 echo -e "\r${!color}${l}${!normal}"
1.16 - CT_PROG_BAR_CPT=0 # Force redrawing progress bar on next 'unlogged' line
1.17 - else
1.18 - ${CT_PROG_BAR}
1.19 + fi
1.20 + if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then
1.21 + str=`CT_DoDate +%s`
1.22 + elapsed=$((str-(CT_STAR_DATE/(1000*1000*1000))))
1.23 + [ ${CT_PROG_BAR_CPT} -eq 0 ] && bar="/"
1.24 + [ ${CT_PROG_BAR_CPT} -eq 10 ] && bar="-"
1.25 + [ ${CT_PROG_BAR_CPT} -eq 20 ] && bar="\\"
1.26 + [ ${CT_PROG_BAR_CPT} -eq 30 ] && bar="|"
1.27 + printf "\r[%02d:%02d] %s " $((elapsed/60)) $((elapsed%60)) "${bar}"
1.28 + CT_PROG_BAR_CPT=$(((CT_PROG_BAR_CPT+1)%40))
1.29 fi
1.30 done
1.31 )