1.1 --- a/scripts/crosstool.sh Tue May 08 12:12:40 2007 +0000
1.2 +++ b/scripts/crosstool.sh Tue May 08 12:54:06 2007 +0000
1.3 @@ -39,13 +39,18 @@
1.4
1.5 # The progress bar indicator is asked for
1.6 if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then
1.7 + _CT_PROG_BAR_DATE() {
1.8 + local str=`CT_DoDate +%s`
1.9 + local elapsed=$((str-(CT_STAR_DATE/(1000*1000*1000))))
1.10 + printf "[%02d:%02d]" $((elapsed/60)) $((elapsed%60))
1.11 + }
1.12 _CT_PROG_BAR() {
1.13 - [ $((cpt/5)) -eq 0 ] && echo -en "/"
1.14 - [ $((cpt/5)) -eq 1 ] && echo -en "-"
1.15 - [ $((cpt/5)) -eq 2 ] && echo -en "\\"
1.16 - [ $((cpt/5)) -eq 3 ] && echo -en "|"
1.17 echo -en "\r"
1.18 - cpt=$(((cpt+1)%20))
1.19 + [ $((cpt/10)) -eq 0 ] && echo -en "`_CT_PROG_BAR_DATE` /"
1.20 + [ $((cpt/10)) -eq 1 ] && echo -en "`_CT_PROG_BAR_DATE` -"
1.21 + [ $((cpt/10)) -eq 2 ] && echo -en "`_CT_PROG_BAR_DATE` \\"
1.22 + [ $((cpt/10)) -eq 3 ] && echo -en "`_CT_PROG_BAR_DATE` |"
1.23 + cpt=$(((cpt+1)%40))
1.24 }
1.25 CT_PROG_BAR=_CT_PROG_BAR
1.26 export -f _CT_PROG_BAR
2.1 --- a/scripts/functions Tue May 08 12:12:40 2007 +0000
2.2 +++ b/scripts/functions Tue May 08 12:54:06 2007 +0000
2.3 @@ -88,7 +88,7 @@
2.4 color="CT_${cur_L}_COLOR"
2.5 normal="CT_NORMAL_COLOR"
2.6 if [ ${cur_l} -le ${max_level} ]; then
2.7 - echo -e "${!color}${l}${!normal}"
2.8 + echo -e "\r${!color}${l}${!normal}"
2.9 else
2.10 ${CT_PROG_BAR}
2.11 fi
2.12 @@ -267,8 +267,10 @@
2.13 ext=`CT_GetFileExtension "${file}"`
2.14 if [ -n "${ext}" ]; then
2.15 if [ "${CT_FORCE_DOWNLOAD}" = "y" ]; then
2.16 + CT_DoLog DEBUG "Removing already present \"${file}\""
2.17 rm -f "${CT_TARBALLS_DIR}/${file}${ext}"
2.18 else
2.19 + CT_DoLog EXTRA "Already have \"${file}\""
2.20 return 0
2.21 fi
2.22 fi