From 14affd9b3a09c25bcb8d7c48d91fbcd08ad299d6 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Thu, 14 Apr 2011 15:51:54 -0500
Subject: [PATCH] usr/bin/byobu-launcher: don't disrupt work flow, but rather
 inform user about launching byobu in a nested screen session, LP: #747649

---
 debian/changelog       |  2 ++
 usr/bin/byobu-launcher | 32 +-------------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9731b288..b3e4df60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ byobu (3.30) unreleased; urgency=low
     md driver's printing to /proc/mdstat, LP: #760693
   * usr/share/byobu/profiles/common: preserve splits across detach/reattach,
     LP: #760696
+  * usr/bin/byobu-launcher: don't disrupt work flow, but rather inform
+    user about launching byobu in a nested screen session, LP: #747649
 
   [ Chaskiel Grundman ]
   * debian/postinst: correctly fix old-school screen-profiles era diversions
diff --git a/usr/bin/byobu-launcher b/usr/bin/byobu-launcher
index e485c3d9..e9dafcdf 100755
--- a/usr/bin/byobu-launcher
+++ b/usr/bin/byobu-launcher
@@ -26,37 +26,7 @@ if [ ! -e "$DATA/disable-autolaunch" ]; then
 	case "$TERM" in
 		*screen*)
 			# Handle nesting
-			printf "$(gettext 'Do you want to launch byobu in a nested session?') [y/N]: "
-			answer=$(head -n1)
-			case "$answer" in
-				y|Y)
-					# Prevent nasty launch recursion, if ssh'ing to localhost
-					if [ -n "$SSH_CONNECTION" ]; then
-						# This is an SSH session
-						from=$(echo "$SSH_CONNECTION" | awk '{print $1}')
-						to=$(echo "$SSH_CONNECTION" | awk '{print $3}')
-						if [ "$from" = "$to" ]; then
-							# We have ssh'd from this machine, to this machine
-							case "$(screen -ls)" in
-								*\(Attached\)*)
-									# And there is already an attached screen session, exit to prevent recursion
-									false
-								;;
-								*)
-									exec $BYOBU_PREFIX/bin/byobu "$@"
-								;;
-							esac
-						else
-							exec $BYOBU_PREFIX/bin/byobu "$@"
-						fi
-					else
-						exec $BYOBU_PREFIX/bin/byobu "$@"
-					fi
-				;;
-				*)
-					false
-				;;
-			esac
+			printf "$(gettext 'To launch in a nested screen session, run: byobu')\n"
 		;;
 		dumb)
 			# Dumb terminal, don't launch