From 823a283d19935b1890e1137f056b974df2dda481 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 8 May 2007 20:41:08 +0000
Subject: Hop, a somewhat more efficient progress bar, less CPU consuming, if
 that was a problem :-) (a litlle recreation while toochains are building...)


diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index 84a7932..1eacc73 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -45,12 +45,13 @@ if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then
         printf "[%02d:%02d]" $((elapsed/60)) $((elapsed%60))
     }
     _CT_PROG_BAR() {
-        [ $((cpt/10)) -eq 0 ] && echo -en "\r`_CT_PROG_BAR_DATE` /"
-        [ $((cpt/10)) -eq 1 ] && echo -en "\r`_CT_PROG_BAR_DATE` -"
-        [ $((cpt/10)) -eq 2 ] && echo -en "\r`_CT_PROG_BAR_DATE` \\"
-        [ $((cpt/10)) -eq 3 ] && echo -en "\r`_CT_PROG_BAR_DATE` |"
-        cpt=$(((cpt+1)%40))
+        [ ${CT_PROG_BAR_CPT} -eq 0  ] && echo -en "\r`_CT_PROG_BAR_DATE` /"
+        [ ${CT_PROG_BAR_CPT} -eq 10 ] && echo -en "\r`_CT_PROG_BAR_DATE` -"
+        [ ${CT_PROG_BAR_CPT} -eq 20 ] && echo -en "\r`_CT_PROG_BAR_DATE` \\"
+        [ ${CT_PROG_BAR_CPT} -eq 30 ] && echo -en "\r`_CT_PROG_BAR_DATE` |"
+        CT_PROG_BAR_CPT=$(((CT_PROG_BAR_CPT+1)%40))
     }
+    CT_PROG_BAR_CPT=0
     CT_PROG_BAR=_CT_PROG_BAR
     export -f _CT_PROG_BAR
 else
diff --git a/scripts/functions b/scripts/functions
index a207576..1bd7fbd 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -91,6 +91,7 @@ CT_DoLog() {
               normal="CT_NORMAL_COLOR"
               if [ ${cur_l} -le ${max_level} ]; then
                   echo -e "\r${!color}${l}${!normal}"
+                  CT_PROG_BAR_CPT=0 # Force redrawing progress bar on next 'unlogged' line
               else
                   ${CT_PROG_BAR}
               fi
-- 
cgit v0.10.2-6-g49f6