# HG changeset patch # User Javier Viguera # Date 1302169943 -7200 # Node ID cbd07f3dd6e3689a6b971e999aa82d09fb94d515 # Parent 0ca0f85a4b2a527a5b6936d46fd8500648eb4877 functions: avoid CR when progress bar is not enabled Using CT-NG with progress bar disabled, still prints CR ('\r') characters on the output. When you capture the output to a file as part of an automated build, it shows extra empty lines. For example: ------------------------------------------------------------ [INFO ] Performing some trivial sanity checks [INFO ] Build started 20110404.113619 [INFO ] Building environment variables [EXTRA] Preparing working directories [EXTRA] Installing user-supplied crosstool-NG configuration ------------------------------------------------------------ Signed-off-by: Javier Viguera diff -r 0ca0f85a4b2a -r cbd07f3dd6e3 scripts/functions --- a/scripts/functions Wed Apr 06 22:30:57 2011 +0200 +++ b/scripts/functions Thu Apr 07 11:52:23 2011 +0200 @@ -106,7 +106,7 @@ printf "[%-5s]%*s%s%s\n" "${cur_L}" "${indent}" " " "${line}" if [ ${cur_l} -le ${max_level} ]; then # Only print to console (fd #6) if log level is high enough. - printf "\r[%-5s]%*s%s%s\n" "${cur_L}" "${indent}" " " "${line}" >&6 + printf "${CT_LOG_PROGRESS_BAR:+\r}[%-5s]%*s%s%s\n" "${cur_L}" "${indent}" " " "${line}" >&6 fi if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then printf "\r[%02d:%02d] %s " $((SECONDS/60)) $((SECONDS%60)) "${_prog_bar[$((_prog_bar_cpt/10))]}" >&6