From cd02a609c1209d72c499993104975a7fccec7241 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Sun, 13 Dec 2009 18:50:46 -0800
Subject: [PATCH]   statusrc:   - define and use a color function for all
 status indicators, gives     infinite flexibility   - replace "undo" with "-"

---
 bin/apport            | 2 +-
 bin/battery           | 2 +-
 bin/cpu_freq          | 2 +-
 bin/custom            | 2 +-
 bin/disk              | 2 +-
 bin/ec2_cost          | 2 +-
 bin/fan_speed         | 2 +-
 bin/hostname          | 2 +-
 bin/ip_address        | 2 +-
 bin/load_average      | 2 +-
 bin/mail              | 2 +-
 bin/mem_available     | 2 +-
 bin/mem_used          | 2 +-
 bin/menu              | 2 +-
 bin/network           | 2 +-
 bin/processes         | 2 +-
 bin/reboot_required   | 4 ++--
 bin/release           | 2 +-
 bin/temp_c            | 2 +-
 bin/temp_f            | 2 +-
 bin/updates_available | 4 ++--
 bin/uptime            | 2 +-
 bin/users             | 2 +-
 bin/whoami            | 2 +-
 bin/wifi_quality      | 2 +-
 byobu-status          | 4 ++--
 debian/changelog      | 6 ++++--
 27 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/bin/apport b/bin/apport
index a9e7def4..7240235c 100755
--- a/bin/apport
+++ b/bin/apport
@@ -36,4 +36,4 @@ if [ "$1" = "--detail" ]; then
 fi
 
 # Print {!} if a /var/crash/*.crash file exists
-ls /var/crash/*.crash >/dev/null 2>&1 && printf "$(color y k){!}$(color undo) "
+ls /var/crash/*.crash >/dev/null 2>&1 && printf "$(color y k){!}$(color -) "
diff --git a/bin/battery b/bin/battery
index acc54a28..c26aafb4 100755
--- a/bin/battery
+++ b/bin/battery
@@ -77,6 +77,6 @@ for bat in $(ls /proc/acpi/battery); do
 			sign="$state"
 		;;
 	esac
-	printf "$bcolor%s$(color undo)$color|%s|$(color undo) " "$percent" "$sign"
+	printf "$bcolor%s$(color -)$color|%s|$(color -) " "$percent" "$sign"
 	break
 done
diff --git a/bin/cpu_freq b/bin/cpu_freq
index 53e8c93f..84c827fa 100755
--- a/bin/cpu_freq
+++ b/bin/cpu_freq
@@ -30,4 +30,4 @@ if [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then
 else
 	freq=$(egrep -i -m 1 "^cpu MHz|^clock|^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }')
 fi
-printf "$(color b c W)%s$(color undo)$(color c W)%s$(color undo) " "$freq" "GHz"
+printf "$(color b c W)%s$(color -)$(color c W)%s$(color -) " "$freq" "GHz"
diff --git a/bin/custom b/bin/custom
index b58184c0..6230fd01 100755
--- a/bin/custom
+++ b/bin/custom
@@ -43,6 +43,6 @@ for i in $(ls "$HOME/.$PKG/bin/"[0-9]*_* 2>/dev/null); do
 		printf "$output"
 	else
 		# Default to inverted coloring
-		printf "$(color invert)$output$(color undo) "
+		printf "$(color invert)$output$(color -) "
 	fi
 done
diff --git a/bin/disk b/bin/disk
index 06f5638c..58e078e2 100755
--- a/bin/disk
+++ b/bin/disk
@@ -34,4 +34,4 @@ esac
 
 disk=$(df -h -P "$MP" 2>/dev/null || df -h "$MP")
 disk=$(echo "$disk" | tail -n 1 | awk '{print $2 " " $5}' | sed "s/\([^0-9\. ]\)/ \1/g" | awk '{printf "%d%sB,%d%", $1, $2, $3}')
-printf "$(color M W)%s$(color undo) " "$disk"
+printf "$(color M W)%s$(color -) " "$disk"
diff --git a/bin/ec2_cost b/bin/ec2_cost
index c87399dc..d2cde3c4 100755
--- a/bin/ec2_cost
+++ b/bin/ec2_cost
@@ -83,4 +83,4 @@ if [ "$DETAIL" = "1" ]; then
 	exit 0
 fi
 
-printf "$(color K G)~\$$(color undo)$(color b K G)%s$(color undo) " $total_cost
+printf "$(color K G)~\$$(color -)$(color b K G)%s$(color -) " $total_cost
diff --git a/bin/fan_speed b/bin/fan_speed
index ef706ffd..7be2c826 100755
--- a/bin/fan_speed
+++ b/bin/fan_speed
@@ -33,7 +33,7 @@ fi
 for i in $(find $DIR/*/*/ -type f -name "fan1_input"); do
 	speed=$(cat "$i")
 	if [ "$speed" -gt 0 ]; then
-	        printf "$(color bold1)%s$(color undo)$(color none)%s$(color undo) " "$speed" "rpm"
+	        printf "$(color bold1)%s$(color -)$(color none)%s$(color -) " "$speed" "rpm"
 		exit 0
 	fi
 done
diff --git a/bin/hostname b/bin/hostname
index 7dacef4a..4a499fab 100755
--- a/bin/hostname
+++ b/bin/hostname
@@ -28,4 +28,4 @@ fi
 . "$HOME/.$PKG/status"
 [ "$whoami" = "1" ] && at="@"
 
-printf "$(color bold2)%s%s$(color undo)" "$at" $(hostname -s 2>/dev/null || hostname)
+printf "$(color bold2)%s%s$(color -)" "$at" $(hostname -s 2>/dev/null || hostname)
diff --git a/bin/ip_address b/bin/ip_address
index a47fad19..437fd827 100755
--- a/bin/ip_address
+++ b/bin/ip_address
@@ -38,4 +38,4 @@ fi
 
 ipaddr=`/sbin/ifconfig "$interface" | grep "inet addr:" | sed -e "s/^.*inet addr://" -e "s/ .*$//"`
 
-printf "%s$(color bold2)%s$(color undo)" "$space" "$ipaddr"
+printf "%s$(color bold2)%s$(color -)" "$space" "$ipaddr"
diff --git a/bin/load_average b/bin/load_average
index d6d99579..746b970d 100755
--- a/bin/load_average
+++ b/bin/load_average
@@ -25,4 +25,4 @@ if [ "$1" = "--detail" ]; then
 	exit 0
 fi
 
-printf "$(color Y k)%s$(color undo) " $(awk '{print $1}' /proc/loadavg)
+printf "$(color Y k)%s$(color -) " $(awk '{print $1}' /proc/loadavg)
diff --git a/bin/mail b/bin/mail
index 914b71e7..0b470f75 100755
--- a/bin/mail
+++ b/bin/mail
@@ -26,4 +26,4 @@ if [ "$1" = "--detail" ]; then
 	exit 0
 fi
 
-[ -s "$mailfile" ] && printf "$(color w k)[M]$(color undo) " || exit 0
+[ -s "$mailfile" ] && printf "$(color w k)[M]$(color -) " || exit 0
diff --git a/bin/mem_available b/bin/mem_available
index 2a69784f..65327177 100755
--- a/bin/mem_available
+++ b/bin/mem_available
@@ -39,4 +39,4 @@ else
 	mem="$mem"
 	unit="KB"
 fi
-printf "$(color b g W)%s$(color undo)$(color g W)$unit%s$(color undo)%s" "$mem" "$comma" "$whitespace"
+printf "$(color b g W)%s$(color -)$(color g W)$unit%s$(color -)%s" "$mem" "$comma" "$whitespace"
diff --git a/bin/mem_used b/bin/mem_used
index 908ac722..b2aaf19a 100755
--- a/bin/mem_used
+++ b/bin/mem_used
@@ -26,4 +26,4 @@ if [ "$1" = "--detail" ]; then
 fi
 
 f=$(free | awk '/buffers\/cache:/ {printf "%.0f", 100*$3/($3 + $4)}')
-printf "$(color b g W)%s$(color undo)$(color g W)%%$(color undo) " "$f"
+printf "$(color b g W)%s$(color -)$(color g W)%%$(color -) " "$f"
diff --git a/bin/menu b/bin/menu
index d0ed1492..a34e47af 100755
--- a/bin/menu
+++ b/bin/menu
@@ -32,4 +32,4 @@ else
 	key="F9"
 fi
 
-printf " $(color k w)%s:<$(color undo)$(color b k w)$key$(color k w)>" `gettext "Menu"`
+printf " $(color k w)%s:<$(color -)$(color b k w)$key$(color k w)>" `gettext "Menu"`
diff --git a/bin/network b/bin/network
index cb46722b..8212bb57 100755
--- a/bin/network
+++ b/bin/network
@@ -58,5 +58,5 @@ for i in up down; do
 			unit="MB/s"
 		fi
 	fi
-	printf "$symbol$(color b m w)$rate$(color undo)$(color m w)$unit$(color undo) "
+	printf "$symbol$(color b m w)$rate$(color -)$(color m w)$unit$(color -) "
 done
diff --git a/bin/processes b/bin/processes
index 193d4f48..2ef65fc9 100755
--- a/bin/processes
+++ b/bin/processes
@@ -25,4 +25,4 @@ if [ "$1" = "--detail" ]; then
 	exit 0
 fi
 
-printf "$(color b y w)%s$(color undo)$(color y w)&$(color undo) " $(ls -d /proc/[0-9]* 2>/dev/null| wc -l)
+printf "$(color b y w)%s$(color -)$(color y w)&$(color -) " $(ls -d /proc/[0-9]* 2>/dev/null| wc -l)
diff --git a/bin/reboot_required b/bin/reboot_required
index 930cc5ad..00def0f4 100755
--- a/bin/reboot_required
+++ b/bin/reboot_required
@@ -31,7 +31,7 @@ case "$1" in
 		[ -e "$reboot" ] && printf "Yes" || printf "No"
 	;;
 	*)
-		[ -e "$reboot" ] && printf "$(color b W)($(color undo)$(color b b W)%s$(color undo)$(color b W))$(color undo) " "R"
-		[ -e "$reload" ] && printf "$(color b W)<$(color undo)$(color b b W)%s$(color undo)$(color b W)>$(color undo) " "F5"
+		[ -e "$reboot" ] && printf "$(color b W)($(color -)$(color b b W)%s$(color -)$(color b W))$(color -) " "R"
+		[ -e "$reload" ] && printf "$(color b W)<$(color -)$(color b b W)%s$(color -)$(color b W)>$(color -) " "F5"
 	;;
 esac
diff --git a/bin/release b/bin/release
index 311d5c45..8a15acb5 100755
--- a/bin/release
+++ b/bin/release
@@ -55,4 +55,4 @@ else
 	DISTRO="Byobu"
 fi
 
-printf "$(color bold2)%s$(color undo) " "$DISTRO"
+printf "$(color bold2)%s$(color -) " "$DISTRO"
diff --git a/bin/temp_c b/bin/temp_c
index 0af30ee5..0e0d2899 100755
--- a/bin/temp_c
+++ b/bin/temp_c
@@ -32,6 +32,6 @@ fi
 
 for i in $MONITORED_TEMP `ls $DIR/*/temperature 2>/dev/null`; do
 	t=$(sed -e "s/^[^0-9]\+//" -e "s/\s.*$//" "$i")
-	printf "$(color b k Y)%s$(color undo)$(color k Y)\260C$(color undo) " "$t"
+	printf "$(color b k Y)%s$(color -)$(color k Y)\260C$(color -) " "$t"
 	break
 done
diff --git a/bin/temp_f b/bin/temp_f
index 963a9211..f2737255 100755
--- a/bin/temp_f
+++ b/bin/temp_f
@@ -28,6 +28,6 @@ fi
 
 for i in `ls $DIR/*/temperature 2>/dev/null`; do
 	t=$(sed -e "s/^[^0-9]\+//" -e "s/\s.*$//" "$i" | awk '{printf "%.0f", $1 *9/5 + 32}')
-	printf "$(color b k Y)%s$(color undo)$(color k Y)\260F$(color undo) " "$t"
+	printf "$(color b k Y)%s$(color -)$(color k Y)\260F$(color -) " "$t"
         break
 done
diff --git a/bin/updates_available b/bin/updates_available
index caa24f64..db0dd38a 100755
--- a/bin/updates_available
+++ b/bin/updates_available
@@ -38,13 +38,13 @@ print_updates() {
 	s=$2
 	if [ -n "$u" ]; then
 		if [ "$u" -gt 0 ]; then
-			printf "$(color b r W)%d$(color undo)$(color r W)!" "$u"
+			printf "$(color b r W)%d$(color -)$(color r W)!" "$u"
 			if [ -n "$s" ]; then
 				if [ "$s" -gt 0 ]; then
 					printf "!"
 				fi
 			fi
-			printf "$(color undo) "
+			printf "$(color -) "
 		fi
 	fi
 }
diff --git a/bin/uptime b/bin/uptime
index 37c110da..72355152 100755
--- a/bin/uptime
+++ b/bin/uptime
@@ -39,4 +39,4 @@ elif [ "$u" -gt 60 ]; then
 else
 	printf "%ds" "$u"
 fi
-printf "$(color undo) "
+printf "$(color -) "
diff --git a/bin/users b/bin/users
index 4bcabd1b..7a77399c 100755
--- a/bin/users
+++ b/bin/users
@@ -31,4 +31,4 @@ fi
 # Note: we'd like to use pgrep -c, however, this isn't available in
 # busybox and some distro's pgrep (and it doesn't exit non-zero).
 count=`pgrep -f "sshd:.*@" | wc -l` || exit 0
-[ $count -gt 0 ] && printf "$(color b w r)%d$(color undo)$(color w r)#$(color undo) " $count
+[ $count -gt 0 ] && printf "$(color b w r)%d$(color -)$(color w r)#$(color -) " $count
diff --git a/bin/whoami b/bin/whoami
index f4f578d1..1e9a6e34 100755
--- a/bin/whoami
+++ b/bin/whoami
@@ -24,4 +24,4 @@ if [ "$1" = "--detail" ]; then
 	exit 0
 fi
 
-printf "$(color bold2)%s$(color undo)" $(whoami)
+printf "$(color bold2)%s$(color -)" $(whoami)
diff --git a/bin/wifi_quality b/bin/wifi_quality
index afdfe6a7..943d6eab 100755
--- a/bin/wifi_quality
+++ b/bin/wifi_quality
@@ -29,4 +29,4 @@ iwconfig=`/sbin/iwconfig 2>/dev/null`
 bitrate=`echo "$iwconfig" | grep "Bit Rate." | sed -e "s/^.*Bit Rate.//" -e "s/ .*$//g"`
 [ -z "$bitrate" ] && bitrate="0"
 quality=`echo "$iwconfig" | grep "Link Quality." | sed -e "s/^.*Link Quality.//" -e "s/ .*$//g" | awk -F/ '{printf "%.0f", 100*$1/$2}'`
-printf "$(color b C k)%s$(color undo)$(color C k)%s,$(color undo)$(color b C k)%s$(color undo)$(color C k)%%$(color UNDO) " "$bitrate" "Mbps" "$quality"
+printf "$(color b C k)%s$(color -)$(color C k)%s,$(color -)$(color b C k)%s$(color -)$(color C k)%%$(color UNDO) " "$bitrate" "Mbps" "$quality"
diff --git a/byobu-status b/byobu-status
index 628ae2b3..de9f6b88 100755
--- a/byobu-status
+++ b/byobu-status
@@ -35,15 +35,15 @@ ESC="\005"
 color() {
 	case $1 in
 		"")     true ;;
+		-)   printf "$ESC{-}" ;;
 		esc)    printf "$ESC" ;;
-		undo)   printf "$ESC{-}" ;;
 		bold1)  printf "$ESC{=b }" ;;
 		bold2)  printf "$ESC{+b }" ;;
 		none)   printf "$ESC{= }" ;;
 		invert) printf "$ESC{=r }" ;;
 		*)
 			if [ "$#" = "2" ]; then
-				[ "$MONOCHROME" = "1" ] && printf "$ESC{ }" || printf "$ESC{= $1$2}"
+				[ "$MONOCHROME" = "1" ] && printf "$ESC{= }" || printf "$ESC{= $1$2}"
 			else
 				[ "$MONOCHROME" = "1" ] && printf "$ESC{=$1 }" || printf "$ESC{=$1 $2$3}"
 			fi
diff --git a/debian/changelog b/debian/changelog
index 89bbb661..66db6837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,8 +69,10 @@ byobu (2.40) unreleased; urgency=low
     bin/menu, bin/network, bin/processes, bin/reboot_required,
     bin/release, bin/temp_c, bin/temp_f, bin/updates_available,
     bin/uptime, bin/users, bin/whoami, bin/wifi_quality, byobu-status,
-    statusrc: define and use a color function for all status indicators,
-    gives infinite flexibility
+    statusrc:
+    - define and use a color function for all status indicators, gives
+      infinite flexibility
+    - replace "undo" with "-"
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 10 Nov 2009 10:18:20 -0600