From e4b2b4629a8c0f1b0a7d525c4e218d48f7aa119f Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 6 Feb 2010 14:13:41 -0800 Subject: [PATCH] * debian/postinst: make sure that byobu-launcher, if selected by default, gets installed late in the /etc/profile.d list * usr/bin/byobu-launcher: do not exec, as this precludes detaching from a session, and being in a non-byobu shell --- debian/changelog | 5 ++++- debian/postinst | 4 ++-- usr/bin/byobu-launcher | 5 ++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7df3d7d1..ca16541e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ byobu (2.55) unreleased; urgency=low - * UNRELEASED + * debian/postinst: make sure that byobu-launcher, if selected by default, + gets installed late in the /etc/profile.d list + * usr/bin/byobu-launcher: do not exec, as this precludes detaching from a + session, and being in a non-byobu shell -- Dustin Kirkland Fri, 05 Feb 2010 09:16:55 -0800 diff --git a/debian/postinst b/debian/postinst index 6084603a..da2d6275 100644 --- a/debian/postinst +++ b/debian/postinst @@ -7,9 +7,9 @@ PKG="byobu" db_get byobu/launch-by-default if [ "$RET" = true ]; then - ln -sf /usr/bin/$PKG-launcher /etc/profile.d/$PKG.sh + ln -sf /usr/bin/$PKG-launcher /etc/profile.d/95-$PKG.sh else - rm -f /etc/profile.d/$PKG.sh + rm -f /etc/profile.d/95-$PKG.sh fi # The target of the diversion somehow disappeared which will cause diff --git a/usr/bin/byobu-launcher b/usr/bin/byobu-launcher index 2da85cab..161ff441 100755 --- a/usr/bin/byobu-launcher +++ b/usr/bin/byobu-launcher @@ -17,6 +17,5 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if [ ! -r "$HOME/.byobu/disable-autolaunch" ]; then - exec /usr/bin/byobu -fi +# Do not 'exec' here +[ ! -r "$HOME/.byobu/disable-autolaunch" ] && /usr/bin/byobu