# HG changeset patch # User Christian Mesh # Date 1337416525 18000 # Node ID fa75f9c09dd8f5dbb3f5dbc526fb60e4317b8eac # Parent 1592841294174137b0d4f451770472c69343247d Update colorize to handle args easier diff -r 159284129417 -r fa75f9c09dd8 rootfs/lib/libtaz.sh --- a/rootfs/lib/libtaz.sh Thu May 17 14:53:51 2012 +0200 +++ b/rootfs/lib/libtaz.sh Sat May 19 03:35:25 2012 -0500 @@ -87,12 +87,14 @@ # Usage: colorize "Message" colorNB or use --color=NB option # when running a tool. Default to white/38 and no html or gtk. colorize() { - : ${color=$2} + : ${color=$1} + shift + local content="$@" case $output in - raw|gtk|html) echo "$1" ;; + raw|gtk|html) echo "$content" ;; *) [ "$color" ] || color=38 - echo -e "\\033[1;${color}m${1}\\033[0;39m" ;; + echo -e "\\033[1;${color}m${content}\\033[0;39m" ;; esac unset color } diff -r 159284129417 -r fa75f9c09dd8 testsuite.sh --- a/testsuite.sh Thu May 17 14:53:51 2012 +0200 +++ b/testsuite.sh Sat May 19 03:35:25 2012 -0500 @@ -14,9 +14,9 @@ boldify "Message" echo -n "Checking libtaz.sh: colorize() " - echo -n $(colorize "Message " 33) - echo -n $(colorize "Message " 35) - colorize "Message" 36 + echo -n $(colorize 33 "Message ") + echo -n $(colorize 35 "Message ") + colorize 36 "Message" echo "Checking libtaz.sh: separator" separator