From db469e55bed080ac1c75c9c6a89f5e083b3d953f Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gmail.com>
Date: Tue, 21 Feb 2012 23:16:45 -0600
Subject: [PATCH] * etc/byobu/backend, usr/lib/byobu/include/common,  
 usr/lib/byobu/include/constants: LP: #937174   - fix upgrades while within a
 running byobu-screen session

---
 debian/changelog                | 3 +++
 etc/byobu/backend               | 2 +-
 usr/lib/byobu/include/common    | 6 ++----
 usr/lib/byobu/include/constants | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fa32c53..14912208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ byobu (5.13) unreleased; urgency=low
   * usr/lib/byobu/include/shutil: LP: #930656
     - support network interface detection on Mac OSX
     - untested by me, but sort of suggested by a user
+  * etc/byobu/backend, usr/lib/byobu/include/common,
+    usr/lib/byobu/include/constants: LP: #937174
+    - fix upgrades while within a running byobu-screen session
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 16 Feb 2012 23:58:36 -0600
 
diff --git a/etc/byobu/backend b/etc/byobu/backend
index d71e61c5..cfe87102 100644
--- a/etc/byobu/backend
+++ b/etc/byobu/backend
@@ -1,4 +1,4 @@
 # BYOBU_BACKEND can currently be "screen" or "tmux"
 # Override this on a per-user basis by editing "$BYOBU_CONFIG_DIR/backend"
 # or by launching either "byobu-screen" or "byobu-tmux" instead of "byobu".
-BYOBU_BACKEND="tmux"
+#BYOBU_BACKEND="tmux"
diff --git a/usr/lib/byobu/include/common b/usr/lib/byobu/include/common
index dc416454..785cec3c 100755
--- a/usr/lib/byobu/include/common
+++ b/usr/lib/byobu/include/common
@@ -31,15 +31,13 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
 			if [ -d "$BYOBU_CONFIG_DIR" ] && [ -r "$BYOBU_CONFIG_DIR/profile" ]; then
 				# Previous byobu configuration exists, default to screen
 				for i in screen tmux; do
-					command -v $i >/dev/null && BYOBU_BACKEND="$i"
-					break
+					command -v $i >/dev/null && BYOBU_BACKEND="$i" && break
 				done
 				unset i
 			else
 				# New byobu configuration, default to tmux
 				for i in tmux screen; do
-					command -v $i >/dev/null && BYOBU_BACKEND="$i"
-					break
+					command -v $i >/dev/null && BYOBU_BACKEND="$i" && break
 				done
 				unset i
 			fi
diff --git a/usr/lib/byobu/include/constants b/usr/lib/byobu/include/constants
index 3ff3e7a5..81017680 100755
--- a/usr/lib/byobu/include/constants
+++ b/usr/lib/byobu/include/constants
@@ -87,7 +87,7 @@ case "$BYOBU_BACKEND" in
 		ESC=
 	;;
 	screen)
-		export BYOBU_BACKEND="screen"
+		export BYOBU_BACKEND
 		BYOBU_ARG_VERSION="-v"
 		ESC="\005"
 	;;