From 0259f85e58e6cba6febac2a88b23ed3875f2be67 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Mon, 8 Feb 2010 23:29:35 -0600
Subject: [PATCH] usr/bin/byobu-launcher: fix recent regression, do exec byobu
 by default, but allow for not exec'ing if ~/.byobu/disable-exec exists, LP:
 #519018

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

diff --git a/debian/changelog b/debian/changelog
index a4a0fb85..d29f86a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 byobu (2.56) unreleased; urgency=low
 
   * debian/control: drop byobu-extras empty package
+  * usr/bin/byobu-launcher: fix recent regression, do exec byobu by default,
+    but allow for not exec'ing if ~/.byobu/disable-exec exists, LP: #519018
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 06 Feb 2010 22:10:52 -0600
 
diff --git a/usr/bin/byobu-launcher b/usr/bin/byobu-launcher
index 161ff441..dc508a05 100755
--- a/usr/bin/byobu-launcher
+++ b/usr/bin/byobu-launcher
@@ -17,5 +17,10 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Do not 'exec' here
-[ ! -r "$HOME/.byobu/disable-autolaunch" ] && /usr/bin/byobu
+if [ ! -r "$HOME/.byobu/disable-autolaunch" ]; then
+	if [ -r "$HOME/.byobu/disable-exec" ]; then
+		/usr/bin/byobu
+	else
+		exec /usr/bin/byobu
+	fi
+fi