From dcdb0828f05ab66443a8cc06b952477738063bee Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Thu, 24 Jun 2010 10:16:39 -0500
Subject: [PATCH] usr/bin/byobu

---
 debian/changelog |  3 ++-
 usr/bin/byobu    | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30c13ef1..f3bd0b49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-byobu (2.81-0ubuntu1) maverick; urgency=low
+byobu (2.81) unreleased; urgency=low
 
   * Save some forks:
     - usr/bin/byobu-status
@@ -10,6 +10,7 @@ byobu (2.81-0ubuntu1) maverick; urgency=low
     - usr/bin/byobu-launch, usr/bin/byobu-launcher-install,
       usr/bin/byobu-launcher-uninstall
     - usr/bin/byobu-launcher
+    - usr/bin/byobu
 
   * usr/bin/byobu-config, usr/share/doc/byobu/help.txt: improve help
     text, per feedback from Turnkey Linux users
diff --git a/usr/bin/byobu b/usr/bin/byobu
index d63695f9..1a78f783 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -71,13 +71,19 @@ if [ "$#" = "0" ]; then
 	if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
 		# Start new custom window set session
 		exec screen $SCREEN_TERM $PROFILE
-	elif echo "$out" | LANG=C egrep -qsi "(No Sockets found in|This room is empty)"; then
-		# Start new default session
-		exec screen $SCREEN_TERM $PROFILE $DEFAULT_WINDOW
 	else
-		# Select and attach to an existing session
-		exec byobu-select-session
+		case "$out" in
+			*\(*\)*)
+				# Select and attach to an existing session
+				exec byobu-select-session
+			;;
+			*)
+				# Start new default session
+				exec screen $SCREEN_TERM $PROFILE $DEFAULT_WINDOW
+			;;
+		esac
 	fi
 else
+	# Launch with command line args
 	exec screen $SCREEN_TERM $PROFILE "$@"
 fi