From 1f7d0608936013befdd14440565dc96147f3ef38 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 3 Jun 2010 01:43:57 -0500 Subject: [PATCH] debian/manpages, rpm/byobu.spec, usr/bin/byobu, usr/bin/shell, usr/share/byobu/windows/common, usr/share/man/man1/shell.1: fix shelltitle breakage by dropping the "-t shell" title hardcoding, and move/rename motd+shell to just shell, LP: #368925 --- debian/changelog | 4 ++++ debian/manpages | 2 +- rpm/byobu.spec | 4 ++-- usr/bin/byobu | 4 ++-- usr/bin/{motd+shell => shell} | 2 +- usr/share/byobu/windows/common | 2 +- usr/share/man/man1/motd+shell.1 | 17 ----------------- usr/share/man/man1/shell.1 | 17 +++++++++++++++++ 8 files changed, 28 insertions(+), 24 deletions(-) rename usr/bin/{motd+shell => shell} (93%) delete mode 100644 usr/share/man/man1/motd+shell.1 create mode 100644 usr/share/man/man1/shell.1 diff --git a/debian/changelog b/debian/changelog index b34d5ec9..f0126739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ byobu (2.78) UNRELEASED; urgency=low * usr/bin/byobu-select-session: allow for default selection of session 1 * usr/bin/byobu-config: prevent the user from changing the escape sequence to / or \, both of which cause problems, LP: #581533 + * debian/manpages, rpm/byobu.spec, usr/bin/byobu, usr/bin/shell, + usr/share/byobu/windows/common, usr/share/man/man1/shell.1: fix shelltitle + breakage by dropping the "-t shell" title hardcoding, and move/rename + motd+shell to just shell, LP: #368925 -- Dustin Kirkland Tue, 01 Jun 2010 10:53:54 -0500 diff --git a/debian/manpages b/debian/manpages index b078ad27..05f6d798 100644 --- a/debian/manpages +++ b/debian/manpages @@ -2,7 +2,7 @@ usr/share/man/man1/byobu-select-profile.1 usr/share/man/man1/byobu-launcher.1 usr/share/man/man1/byobu-reconnect-sockets.1 usr/share/man/man1/byobu-status.1 -usr/share/man/man1/motd+shell.1 +usr/share/man/man1/shell.1 usr/share/man/man1/byobu-export.1 usr/share/man/man1/byobu-config.1 usr/share/man/man1/byobu-status-detail.1 diff --git a/rpm/byobu.spec b/rpm/byobu.spec index a37e26e5..f7f013b0 100644 --- a/rpm/byobu.spec +++ b/rpm/byobu.spec @@ -58,12 +58,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/%{name} %config %{_sysconfdir}/%{name}/* %{_bindir}/%{name}* -%{_bindir}/motd+shell +%{_bindir}/shell %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/* %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo %{_mandir}/man1/%{name}*.1.gz -%{_mandir}/man1/motd+shell.1.gz +%{_mandir}/man1/shell.1.gz %{_prefix}/lib/%{name}/* %changelog diff --git a/usr/bin/byobu b/usr/bin/byobu index a4ceb434..80ece6aa 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -52,8 +52,8 @@ else fi export BYOBU_WINDOWS -# Launch motd+shell, unless the user has default windows set to launch -grep -qs "^[^#]" "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="-t shell motd+shell" +# Launch shell, unless the user has default windows set to launch +grep -qs "^[^#]" "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="shell" # Check if our terminfo supports 256 colors [ -x /usr/bin/tput ] && [ $(/usr/bin/tput colors 2>/dev/null || echo 0) -eq 256 ] && SCREEN_TERM="-T screen-256color" diff --git a/usr/bin/motd+shell b/usr/bin/shell similarity index 93% rename from usr/bin/motd+shell rename to usr/bin/shell index abdfccab..ff86545c 100755 --- a/usr/bin/motd+shell +++ b/usr/bin/shell @@ -1,6 +1,6 @@ #!/bin/sh # -# motd+shell +# shell: display the MOTD and launch the default shell # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland diff --git a/usr/share/byobu/windows/common b/usr/share/byobu/windows/common index 4a9f265f..a55d4da6 100644 --- a/usr/share/byobu/windows/common +++ b/usr/share/byobu/windows/common @@ -2,4 +2,4 @@ #screen -t notify-osd -M tail -f $HOME/.cache/notify-osd.log #screen -t top top #screen -t web w3m -#screen -t shell motd+shell +#screen -t shell shell diff --git a/usr/share/man/man1/motd+shell.1 b/usr/share/man/man1/motd+shell.1 deleted file mode 100644 index b1b7d0c7..00000000 --- a/usr/share/man/man1/motd+shell.1 +++ /dev/null @@ -1,17 +0,0 @@ -.TH motd+shell 1 "11 Feb 2009" byobu "byobu" -.SH NAME -motd+shell \- Print the message of the day and launch a shell - -.SH DESCRIPTION -\fBmotd+shell\fP is a simple script that prints the message of the day (/etc/motd) and launches a shell. - -$SHELL will be invoked if it exists. Otherwise, /bin/sh will be used. - -.TP -\fIhttp://launchpad.net/byobu\fP -.PD - -.SH AUTHOR -This manpage and the \fBmotd+shell\fP utility was written by Dustin Kirkland for Ubuntu systems (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation. - -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. diff --git a/usr/share/man/man1/shell.1 b/usr/share/man/man1/shell.1 new file mode 100644 index 00000000..ad7d5d08 --- /dev/null +++ b/usr/share/man/man1/shell.1 @@ -0,0 +1,17 @@ +.TH shell 1 "11 Feb 2009" byobu "byobu" +.SH NAME +shell \- Print the message of the day and launch a shell + +.SH DESCRIPTION +\fBshell\fP is a simple script that prints the message of the day (/etc/motd) and launches a shell. + +$SHELL will be invoked if it exists. Otherwise, /bin/sh will be used. + +.TP +\fIhttp://launchpad.net/byobu\fP +.PD + +.SH AUTHOR +This manpage and the \fBshell\fP utility was written by Dustin Kirkland for Ubuntu systems (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation. + +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.