From 678e6348d2fb9e3bcbb48317a17866de057910df Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gmail.com>
Date: Mon, 17 Mar 2014 09:46:27 +0900
Subject: [PATCH] * usr/bin/byobu-launcher-uninstall.in,
 usr/bin/byobu-launch.in: LP: #1292228   - allow byobu-launch to pass
 arguments through to byobu-launcher   - fix up the uninstallation of byobu
 launcher

---
 debian/changelog                    | 3 +++
 usr/bin/byobu-launch.in             | 2 +-
 usr/bin/byobu-launcher-uninstall.in | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dc4eb7a..e3ffb5eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ byobu (5.75) unreleased; urgency=medium
     - have the constants source that file
     - use that file when creating the user's local color palette
     - use a bit more orange
+  * usr/bin/byobu-launcher-uninstall.in, usr/bin/byobu-launch.in: LP: #1292228
+    - allow byobu-launch to pass arguments through to byobu-launcher
+    - fix up the uninstallation of byobu launcher
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 16 Mar 2014 12:46:36 -0700
 
diff --git a/usr/bin/byobu-launch.in b/usr/bin/byobu-launch.in
index 1ea36b6b..2118f9ff 100755
--- a/usr/bin/byobu-launch.in
+++ b/usr/bin/byobu-launch.in
@@ -61,7 +61,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
 				[ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="history -a;history -r;$PROMPT_COMMAND" || PROMPT_COMMAND="history -a;history -r"
 				# Source profile, if necessary
 				[ -z "$_byobu_sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile"
-				if byobu-launcher; then
+				if byobu-launcher "$@" ; then
 					# Wait very briefly for the no-logout flag to get written?
 					sleep 0.1
 					if [ -e "$BYOBU_CONFIG_DIR/no-logout-on-detach" ] || [ -e "$BYOBU_RUN_DIR/no-logout" ]; then
diff --git a/usr/bin/byobu-launcher-uninstall.in b/usr/bin/byobu-launcher-uninstall.in
index 049e4706..8fc9afc6 100755
--- a/usr/bin/byobu-launcher-uninstall.in
+++ b/usr/bin/byobu-launcher-uninstall.in
@@ -27,7 +27,7 @@ remove_launcher() {
 	dest=$1
 	if [ -w "$dest" ]; then
 		# keep any comments, and remove lines invoking byobu:
-		$BYOBU_SED -i -e '/^\s*#/n' -e "/\b$PKG-launch\$/d" -e "/ screen-launch/d" "$dest" -e "/byobu-launcher$/d"
+		$BYOBU_SED -i -e '/^\s*#/n' -e "/\b$PKG-launch/d" -e "/\bscreen-launch/d" "$dest"
 	fi
 }