usr/bin/byobu

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

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