From 7283a5b6ff852822c736445dee7f5d73cfc9e02c Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Tue, 16 Feb 2010 16:35:44 -0600
Subject: [PATCH] byobu-export, byobu-janitor, byobu-select-profile,
 byobu-status: make MONOCHROME more discoverable

---
 debian/changelog             | 2 ++
 usr/bin/byobu-export         | 2 +-
 usr/bin/byobu-janitor        | 2 +-
 usr/bin/byobu-select-profile | 3 ++-
 usr/bin/byobu-status         | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2101e627..aeb92c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 byobu (2.58) unreleased; urgency=low
 
   * usr/share/byobu/pixmaps/byobu.svg: cleaned up icon
+  * byobu-export, byobu-janitor, byobu-select-profile, byobu-status:
+    make MONOCHROME more discoverable
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 09 Feb 2010 13:55:40 -0600
 
diff --git a/usr/bin/byobu-export b/usr/bin/byobu-export
index 34cf7053..672ae5d0 100755
--- a/usr/bin/byobu-export
+++ b/usr/bin/byobu-export
@@ -79,7 +79,7 @@ for i in etc usr/bin usr/lib usr/share/doc; do
 done
 dpkg-query --show --showformat '${Package} ${Version}\n' $PKG > "$DIR/.$PKG/version" 2>/dev/null || true
 echo "http://launchpad.net/$PKG" >> "$DIR/.$PKG/version"
-printf "FOREGROUND=w\nBACKGROUND=k\n" > "$DIR/.$PKG/color"
+printf "FOREGROUND=w\nBACKGROUND=k\nMONOCHROME=0" > "$DIR/.$PKG/color"
 
 # Copy necessary scripts
 cp -a /etc/$PKG "$DIR/.$PKG/etc"
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index fd1775df..3648f35c 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -59,7 +59,7 @@ fi
 # Affects: First runs with no configuration
 # Seed the configuration
 [ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG"
-[ -r "$HOME/.$PKG/color" ] || printf "BACKGROUND=k\nFOREGROUND=w" > "$HOME/.$PKG/color"
+[ -r "$HOME/.$PKG/color" ] || printf "BACKGROUND=k\nFOREGROUND=w\nMONOCHROME=0" > "$HOME/.$PKG/color"
 [ -r "$PROFILE" ] || ln -sf /usr/share/$PKG/profiles/common "$PROFILE"
 
 # Affects: Symlinks pointing to color profiles
diff --git a/usr/bin/byobu-select-profile b/usr/bin/byobu-select-profile
index 91d0b916..6ceeeb9d 100755
--- a/usr/bin/byobu-select-profile
+++ b/usr/bin/byobu-select-profile
@@ -173,7 +173,8 @@ setcolor() {
 	else
 		BACKGROUND=$(getletter "$color")
 	fi
-	printf "FOREGROUND=$FOREGROUND\nBACKGROUND=$BACKGROUND\n" > $FILE
+	[ "$MONOCHROME" = "1" ] || MONOCHROME=0
+	printf "FOREGROUND=$FOREGROUND\nBACKGROUND=$BACKGROUND\nMONOCHROME=$MONOCHROME" > $FILE
 	touch "/var/run/screen/S-$USER/$PKG.reload-required"
 }
 
diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status
index 2a5a48e6..d518950a 100755
--- a/usr/bin/byobu-status
+++ b/usr/bin/byobu-status
@@ -45,9 +45,9 @@ color() {
 		invert) printf "$ESC{=r }" ;;
 		*)
 			if [ "$#" = "2" ]; then
-				[ "$COLOR" = "monochrome" ] && printf "$ESC{= }" || printf "$ESC{= $1$2}"
+				[ "$MONOCHROME" = "1" ] && printf "$ESC{= }" || printf "$ESC{= $1$2}"
 			else
-				[ "$COLOR" = "monochrome" ] && printf "$ESC{=$1 }" || printf "$ESC{=$1 $2$3}"
+				[ "$MONOCHROME" = "1" ] && printf "$ESC{=$1 }" || printf "$ESC{=$1 $2$3}"
 			fi
 		;;
 	esac