From e6bcfba747e73c75e60ef1a0567c191a54670b12 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Mon, 7 Dec 2009 10:25:10 -0600
Subject: [PATCH] * byobu-config, statusrc: enable whoami, hostname, ip_address
 by default;   it seems I almost *always* turn these on, seem useful;
 re-disable if   there are noisy complaints * byobu-janitor, statusrc: seed
 the ~/.byobu/status file with the   default values, making it easier for
 users to customize themselves

---
 byobu-config     |  6 +++---
 byobu-janitor    |  4 ++--
 debian/changelog |  5 +++++
 statusrc         | 17 ++++++++++++++---
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/byobu-config b/byobu-config
index 3debed35..a3441126 100755
--- a/byobu-config
+++ b/byobu-config
@@ -280,8 +280,8 @@ def readstatus():
     status["disk"]=0
     status["ec2_cost"]=0
     status["fan_speed"]=0
-    status["hostname"]=0
-    status["ip_address"]=0
+    status["hostname"]=1
+    status["ip_address"]=1
     status["load_average"]=1
     status["logo"]=1
     status["mail"]=0
@@ -298,7 +298,7 @@ def readstatus():
     status["users"]=0
     status["updates_available"]=1
     status["uptime"]=1
-    status["whoami"]=0
+    status["whoami"]=1
     status["wifi_quality"]=0
     if os.path.exists(HOME+'/.'+PKG+'/status'):
         f=open(HOME+'/.'+PKG+'/status', 'r')
diff --git a/byobu-janitor b/byobu-janitor
index 7bcf240d..976ad0a2 100755
--- a/byobu-janitor
+++ b/byobu-janitor
@@ -59,7 +59,7 @@ fi
 # Affects: First runs with no configuration
 # Seed the configuration
 [ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG"
-byobu-select-profile -b W -f k >/dev/null 2>&1
+[ -r "$HOME/.$PKG/color" ] || byobu-select-profile -b W -f k >/dev/null 2>&1
 [ -r "$HOME/.$PKG/profile" ] || ln -sf /usr/share/$PKG/profiles/common "$PROFILE"
 
 # Affects: Symlinks pointing to color profiles
@@ -92,7 +92,7 @@ if [ -h "$PROFILE" ] && \
 fi
 
 [ -s "$HOME/.$PKG/keybindings" ] || echo "source /usr/share/$PKG/keybindings/common" > "$HOME/.$PKG/keybindings"
-[ -r "$HOME/.$PKG/status" ] || touch "$HOME/.$PKG/status"
+[ -r "$HOME/.$PKG/status" ] || $(grep -A 999999 BEGIN_CUT_HERE /etc/$PKG/statusrc | grep -B 999999 END_CUT_HERE | grep -v CUT > "$HOME/.$PKG/status")
 [ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows"
 [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
 
diff --git a/debian/changelog b/debian/changelog
index cc172bf6..0ff0350e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,11 @@ byobu (2.40) unreleased; urgency=low
     documentation
   * debian/profile: establish symlinks for the color profiles to ensure
     smooth upgrades; all point to the common profile now
+  * byobu-config, statusrc: enable whoami, hostname, ip_address by default;
+    it seems I almost *always* turn these on, seem useful; re-disable if
+    there are noisy complaints
+  * byobu-janitor, statusrc: seed the ~/.byobu/status file with the
+    default values, making it easier for users to customize themselves
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 10 Nov 2009 10:18:20 -0600
 
diff --git a/statusrc b/statusrc
index dceb5d19..2e9c8536 100644
--- a/statusrc
+++ b/statusrc
@@ -18,6 +18,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# BEGIN_CUT_HERE
+# Toggle status notifications
 apport=0
 arch=0
 battery=0
@@ -27,8 +29,8 @@ date=1
 disk=0
 ec2_cost=0
 fan_speed=0
-hostname=0
-ip_address=0
+hostname=1
+ip_address=1
 load_average=1
 logo=1
 mail=0
@@ -45,9 +47,18 @@ time=1
 users=0
 updates_available=1
 uptime=1
-whoami=0
+whoami=1
 wifi_quality=0
 
+# Configurations that you can override; if you leave these commented out,
+# Byobu will auto-detect them.
+#LOGO="\o/"
+#MONITORED_DISK=/
+#MONITORED_INTERFACE=eth0
+#MONITORED_TEMP=/proc/acpi/thermal_zone/THM0/temperature
+#DISTRO=Ubuntu
+# END_CUT_HERE
+
 # Define colors
 ESC="\005"
 UNDO="$ESC{-}"