* screen-launcher-install, screen-launcher-uninstall: use

.hushlogin to prevent double-printing of motd


Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
Dustin Kirkland 2009-06-12 12:03:35 -05:00
commit 6549d740c5
3 changed files with 7 additions and 2 deletions

5
debian/changelog vendored
View file

@ -3,9 +3,10 @@ byobu (2.11) unreleased; urgency=low
* debian/install, keybindings/common.disable: add support for * debian/install, keybindings/common.disable: add support for
enabling/disabling the byobu keybindings, with ctrl-a-( and enabling/disabling the byobu keybindings, with ctrl-a-( and
ctrl-a-), LP: #386363 ctrl-a-), LP: #386363
* screen-launcher-install, screen-launcher-uninstall: use
.hushlogin to prevent double-printing of motd
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 12 Jun 2009 12:02:10 -0500
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 12 Jun 2009 11:40:45 -0500
byobu (2.10-0ubuntu1) karmic; urgency=low byobu (2.10-0ubuntu1) karmic; urgency=low

View file

@ -26,6 +26,8 @@ install_screen_launcher() {
launcher_line="\`echo \$- | grep -qs i\` && [ -x $launcher ] && $launcher" launcher_line="\`echo \$- | grep -qs i\` && [ -x $launcher ] && $launcher"
# Add it at the end # Add it at the end
echo "$launcher_line" >> "$dest" echo "$launcher_line" >> "$dest"
# Hush login, since byobu will handle motd printing
touch "$HOME"/.hushlogin
} }
# Sanitize the environment # Sanitize the environment

View file

@ -24,6 +24,8 @@ remove_screen_launcher() {
if [ -w "$dest" ]; then if [ -w "$dest" ]; then
sed -i '/\/usr\/bin\/screen-launcher$/d' "$dest" sed -i '/\/usr\/bin\/screen-launcher$/d' "$dest"
fi fi
# the install disabled motd printing; re-enable
rm "$HOME"/.hushlogin 2>/dev/null || true
} }
for i in ".profile" ".bashrc" ".bash_profile" ".zprofile"; do for i in ".profile" ".bashrc" ".bash_profile" ".zprofile"; do