usr/bin/byobu-launch, usr/bin/byobu-launcher-install,

usr/bin/byobu-janitor: exit 0 after launching byobu; this is superior
to previously reverted implementations where we exec'd byobu, since
we'll only exit 0 if the byobu/screen session exits cleanly; this will
keep the user from having to do the double-exit when detaching,
LP: #568306

debian/changelog

@@ -1,6 +1,11 @@
 byobu (2.71) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu-launch, usr/bin/byobu-launcher-install,
+    usr/bin/byobu-janitor: exit 0 after launching byobu; this is superior
+    to previously reverted implementations where we exec'd byobu, since
+    we'll only exit 0 if the byobu/screen session exits cleanly; this will
+    keep the user from having to do the double-exit when detaching,
+    LP: #568306
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 21 Apr 2010 23:08:18 -0500
 

usr/bin/byobu-janitor

@@ -129,6 +129,11 @@ if [ -h "/etc/profile.d/Z98-$PKG.sh" ]; then
 	sed -i "/$PKG-launcher$/d" "$HOME"/.profile || true
 fi
 
+# Affects: Upgrades from <= byobu-2.70 that autolaunch
+# Update the byobu-launch line, if necessary
+if grep -qs "^\`echo \$- | grep -qs i\` && $PKG-launcher$" "$HOME"/.profile; then
+	$PKG-launcher-uninstall && $PKG-launcher-install
+fi
 
 # Clean up flag
 rm -f "$FLAG"

usr/bin/byobu-launch

@@ -17,4 +17,4 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-`echo \$- | grep -qs i` && byobu-launcher
+`echo \$- | grep -qs i` && byobu-launcher && exit 0

usr/bin/byobu-launcher-install

@@ -21,7 +21,7 @@
 PKG="byobu"
 
 install_launcher() {
-	echo "\`echo \$- | grep -qs i\` && $PKG-launcher" >> "$1"
+	echo "\`echo \$- | grep -qs i\` && $PKG-launcher && exit 0" >> "$1"
 }
 
 # Sanitize the environment