# HG changeset patch # User "Yann E. MORIN" # Date 1180385860 0 # Node ID 860f8380538dec8972af7a103aef5afaf7131d09 # Parent 868aa6d66b01f58441966985891e52cbb851e2a8 Don't start a state restoration if it is not available. Fortuitly discovered that $SECONDS is inherited from shell to sub-shells. Good! diff -r 868aa6d66b01 -r 860f8380538d scripts/functions --- a/scripts/functions Sun May 27 21:30:34 2007 +0000 +++ b/scripts/functions Mon May 28 20:57:40 2007 +0000 @@ -67,8 +67,7 @@ cat - else echo "${1}" - fi |( offset=$((`CT_DoDate +%s`+(CT_STAR_DATE/(1000*1000*1000)))) - IFS="\n" # We want the full lines, even leading spaces + fi |( IFS="\n" # We want the full lines, even leading spaces CT_PROG_BAR_CPT=0 indent=$((2*CT_STEP_COUNT)) while read line; do @@ -86,12 +85,11 @@ echo -e "\r${l}" >&6 fi if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then - elapsed=$((SECONDS+OFFSET)) [ ${CT_PROG_BAR_CPT} -eq 0 ] && bar="/" [ ${CT_PROG_BAR_CPT} -eq 10 ] && bar="-" [ ${CT_PROG_BAR_CPT} -eq 20 ] && bar="\\" [ ${CT_PROG_BAR_CPT} -eq 30 ] && bar="|" - printf "\r[%02d:%02d] %s " $((elapsed/60)) $((elapsed%60)) "${bar}" >&6 + printf "\r[%02d:%02d] %s " $((SECONDS/60)) $((SECONDS%60)) "${bar}" >&6 CT_PROG_BAR_CPT=$(((CT_PROG_BAR_CPT+1)%40)) fi done @@ -548,6 +546,8 @@ local old_RESTART="${CT_RESTART}" local old_STOP="${CT_STOP}" + CT_TestOrAbort "The previous build did not reach the point where it could be restarted at \"${CT_RESTART}\"" -d "${state_dir}" + # We need to do something special with the log file! if [ "${CT_LOG_TO_FILE}" = "y" ]; then exec >"${state_dir}/tail.log"