SliTaz Repositories

     1.1 --- a/libseb.sh	Mon Mar 06 20:34:49 2017 +0000
     1.2 +++ b/libseb.sh	Mon Mar 13 16:42:29 2017 +0100
     1.3 @@ -17,9 +17,20 @@
     1.4  
     1.5  # Exit if command returns 1
     1.6  check() {
     1.7 -	case "$?" in
     1.8 -		0) info 32 "Done" ;;
     1.9 -		1) colorize 31 "--> Error" && exit 1 ;;
    1.10 +	local code="$?"
    1.11 +	case "$output" in
    1.12 +		html)
    1.13 +			case "$code" in
    1.14 +				0) echo " <span style='color: green;'>Done</span>" ;;
    1.15 +				1) 
    1.16 +					echo " <span style='color: red;'>--> Error</span>" 
    1.17 +					exit 1 ;;
    1.18 +			esac ;;
    1.19 +		*)
    1.20 +			case "$code" in
    1.21 +				0) info 32 "Done" ;;
    1.22 +				1) colorize 31 "--> Error" && exit 1 ;;
    1.23 +			esac ;;
    1.24  	esac
    1.25  }
    1.26  
    1.27 @@ -41,7 +52,10 @@
    1.28  indent() {
    1.29  	local in="$1"
    1.30  	shift
    1.31 -	echo -e "\033["${in}"G $@";
    1.32 +	case "$output" in
    1.33 +		html) echo ": $@" ;;
    1.34 +		*) echo -e "\033["${in}"G $@" ;;
    1.35 +	esac
    1.36  }
    1.37  
    1.38  # Display a bold message
    1.39 @@ -56,27 +70,43 @@
    1.40  colorize() {
    1.41  	: ${color=$1}
    1.42  	shift
    1.43 -	case "$color" in
    1.44 -		0*) echo -e "\\033[${color:-38}m$@\\033[39m" ;;
    1.45 -		*)  echo -e "\\033[1;${color:-38}m$@\\033[0;39m" ;;
    1.46 +	case "$output" in
    1.47 +		html|raw) echo "$@" ;;
    1.48 +		*) 
    1.49 +			case "$color" in
    1.50 +				0*) echo -e "\\033[${color:-38}m$@\\033[39m" ;;
    1.51 +				*)  echo -e "\\033[1;${color:-38}m$@\\033[0;39m" ;;
    1.52 +			esac ;;
    1.53  	esac; unset color
    1.54  }
    1.55  
    1.56  # Last command status
    1.57  status() {
    1.58  	local code="$?"
    1.59 -	case "$code" in
    1.60 -		0) indent $(($(get_cols) - 11)) "[ $(colorize 32 'Done') ]" ;;
    1.61 -		1) indent $(($(get_cols) - 11)) "[ $(colorize 31 'Fail') ]" ;;
    1.62 +	case "$output" in
    1.63 +		html)
    1.64 +			case "$code" in
    1.65 +				0) echo " <span style='color: green;'>Done</span>" ;;
    1.66 +				1) echo " <span style='color: red;'>Fail</span>" ;;
    1.67 +			esac ;;
    1.68 +		*)
    1.69 +			case "$code" in
    1.70 +				0) info 32 "Done" ;;
    1.71 +				1) info 31 "Fail" ;;
    1.72 +			esac ;;
    1.73  	esac
    1.74  }
    1.75  
    1.76  # Print info a la status way: info [color] [content]
    1.77  info() {
    1.78  	local info="$2"
    1.79 -	local char="$(echo $info | wc -L)"
    1.80 -	local in=$((7 + ${char}))
    1.81 -	indent $(($(get_cols) - ${in})) "[ $(colorize $1 $info) ]"
    1.82 +	case "$output" in
    1.83 +		html) echo " <span class='info'>$info</span>" ;;
    1.84 +		*)
    1.85 +			local char="$(echo $info | wc -L)"
    1.86 +			local in=$((7 + ${char}))
    1.87 +			indent $(($(get_cols) - ${in})) "[ $(colorize $1 $info) ]" ;;
    1.88 +	esac
    1.89  }
    1.90  
    1.91  # Line separator