SliTaz Repositories

     1.1 --- a/rootfs/lib/libtaz.sh	Fri Jun 01 19:53:44 2012 +0200
     1.2 +++ b/rootfs/lib/libtaz.sh	Sun Jun 03 14:09:18 2012 +0000
     1.3 @@ -98,18 +98,7 @@
     1.4  	esac
     1.5  }
     1.6  
     1.7 -# Better to keep messages unsplitted
     1.8 -# Example: unboldify "My <b>pretty</b> function ;)"
     1.9 -unboldify() {
    1.10 -	case $output in
    1.11 -		raw)	echo "$@" | sed -e 's|<b>||g;s|</b>||g' ;;
    1.12 -		gtk)	echo "$@" ;;
    1.13 -		html)	echo "$@" | sed -e 's|<b>|<strong>|g;s|</b>|</strong>|g' ;;
    1.14 -		*)		echo -e "$(echo "$@" | sed -e 's|<b>|\\033[1m|g;s|</b>|\\033[0m|g')" ;;
    1.15 -	esac
    1.16 -}
    1.17 -
    1.18 -# Usage: colorize "Message" colorNB or use --color=NB option
    1.19 +# Usage: colorize colorNB "Message"  or use --color=NB option
    1.20  # when running a tool. Default to white/38 and no html or gtk.
    1.21  colorize() {
    1.22  	: ${color=$1}
    1.23 @@ -131,6 +120,35 @@
    1.24  	echo -e "\033["$in"G $@";
    1.25  }
    1.26  
    1.27 +# Extended MeSsaGe output
    1.28 +emsg() {
    1.29 +	local sep="\n--------\n"
    1.30 +	case $output in
    1.31 +		raw)
    1.32 +			echo "$@" | sed -e 's|<b>||g; s|</b>||g; s|<c [0-9]*>||g; \
    1.33 +			s|</c>||g; s|<->|'$sep'|g; s|<n>|\n|g; s|<i [0-9]*>| |g' ;;
    1.34 +		gtk)
    1.35 +			echo "$@" | sed -e 's|<c [0-9]*>||g; s|</c>||g; s|<->|'$sep'|g; \
    1.36 +			s|<n>|\n|g; s|<i [0-9]*>| |g' ;;
    1.37 +		html)
    1.38 +			echo "$@" | sed -e 's|<b>|<strong>|g; s|</b>|</strong>|g; \
    1.39 +			s|<n>|<br/>|g; s|<->|<hr/>|g; s|<i [0-9]*>| |g' ;;
    1.40 +		*)
    1.41 +			local sep="\n"
    1.42 +			local cols=$(get_cols)
    1.43 +			[ "$cols" ] || cols=80
    1.44 +			for c in $(seq 1 $cols)
    1.45 +			do
    1.46 +				sep="${sep}="
    1.47 +			done
    1.48 +			echo -en "$(echo "$@" | sed -e 's|<b>|\\033[1m|g; s|</b>|\\033[0m|g; \
    1.49 +			s|<c \([0-9]*\)>|\\033[1;\1m|g; s|</c>|\\033[0;39m|g; s|<n>|\n|g; \
    1.50 +			s|<->|'$sep'|g; s|<i \([0-9]*\)>|\\033[\1G|g')"
    1.51 +			[ "$1" != "-n" ] && echo
    1.52 +			;;
    1.53 +	esac
    1.54 +}
    1.55 +
    1.56  # Check if user is logged as root.
    1.57  check_root() {
    1.58  	if [ $(id -u) != 0 ]; then
    1.59 @@ -141,7 +159,7 @@
    1.60  
    1.61  # Display debug info when --debug is used.
    1.62  debug() {
    1.63 -	[ "$debug" ] && echo "$(colorize $decolor "DEBUG:") $1"
    1.64 +	[ "$debug" ] && echo "$(colorize $decolor 'DEBUG:') $1"
    1.65  }
    1.66  
    1.67  # Gettextize yes/no.