SliTaz Repositories

     1.1 --- a/rootfs/lib/libtaz.sh	Tue Aug 18 19:04:10 2015 +0300
     1.2 +++ b/rootfs/lib/libtaz.sh	Sat Nov 21 17:50:14 2015 +0200
     1.3 @@ -61,10 +61,8 @@
     1.4  			 done=" <span class=\"float-right color$okcolor\">$okmsg</span>"
     1.5  			error=" <span class=\"float-right color$ercolor\">$ermsg</span>";;
     1.6  		*)
     1.7 -			local cols=$(get_cols)
     1.8 -			local scol=$((${cols:-80} - 10))
     1.9 -			 done="\\033[${scol}G[ \\033[1;${okcolor}m${okmsg}\\033[0;39m ]"
    1.10 -			error="\\033[${scol}G[ \\033[1;${ercolor}m${ermsg}\\033[0;39m ]";;
    1.11 +			 done="[ \\033[1;${okcolor}m${okmsg}\\033[0;39m ]"
    1.12 +			error="[ \\033[1;${ercolor}m${ermsg}\\033[0;39m ]";;
    1.13  	esac
    1.14  	case $check in
    1.15  		0) echo -e "$done";;
    1.16 @@ -219,9 +217,16 @@
    1.17  
    1.18  # Print current action
    1.19  action() {
    1.20 +	local w cols scol msg chars padding
    1.21 +	w=$(_ 'w'); w=${w/w/10}
    1.22 +	cols=$(get_cols); cols=${cols:-80}; scol=$(( $cols - $w ))
    1.23 +	msg="$(_n "$@" | fold -sw$scol)"
    1.24 +	chars=$(echo -n "$msg" | tail -n1 | wc -m); padding=$(( $scol - $chars ))
    1.25 +	msg="$(printf '%s%'$padding's' "$msg" "")"
    1.26 +
    1.27  	case $output in
    1.28 -		raw|gtk|html) _n "$@";;
    1.29 -		*) echo -ne "\033[0;33m$(_ "$@")\033[0m";;
    1.30 +		raw|gtk|html) echo -n "$msg";;
    1.31 +		*) echo -ne "\033[0;33m$msg\033[0m";;
    1.32  	esac
    1.33  }
    1.34