From 6549d740c5dfcc3c2b3e2c0b51302f94f733e1dd Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 12 Jun 2009 12:03:35 -0500 Subject: [PATCH] * screen-launcher-install, screen-launcher-uninstall: use .hushlogin to prevent double-printing of motd Signed-off-by: Dustin Kirkland --- debian/changelog | 5 +++-- screen-launcher-install | 2 ++ screen-launcher-uninstall | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ced4b106..55f3eebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,10 @@ byobu (2.11) unreleased; urgency=low * debian/install, keybindings/common.disable: add support for enabling/disabling the byobu keybindings, with ctrl-a-( and ctrl-a-), LP: #386363 + * screen-launcher-install, screen-launcher-uninstall: use + .hushlogin to prevent double-printing of motd - - -- Dustin Kirkland Fri, 12 Jun 2009 11:40:45 -0500 + -- Dustin Kirkland Fri, 12 Jun 2009 12:02:10 -0500 byobu (2.10-0ubuntu1) karmic; urgency=low diff --git a/screen-launcher-install b/screen-launcher-install index e3b31645..382848d1 100755 --- a/screen-launcher-install +++ b/screen-launcher-install @@ -26,6 +26,8 @@ install_screen_launcher() { launcher_line="\`echo \$- | grep -qs i\` && [ -x $launcher ] && $launcher" # Add it at the end echo "$launcher_line" >> "$dest" + # Hush login, since byobu will handle motd printing + touch "$HOME"/.hushlogin } # Sanitize the environment diff --git a/screen-launcher-uninstall b/screen-launcher-uninstall index 1f04d8cd..dbe5ae33 100755 --- a/screen-launcher-uninstall +++ b/screen-launcher-uninstall @@ -24,6 +24,8 @@ remove_screen_launcher() { if [ -w "$dest" ]; then sed -i '/\/usr\/bin\/screen-launcher$/d' "$dest" fi + # the install disabled motd printing; re-enable + rm "$HOME"/.hushlogin 2>/dev/null || true } for i in ".profile" ".bashrc" ".bash_profile" ".zprofile"; do