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
This commit is contained in:
Dustin Kirkland 2010-06-03 01:43:57 -05:00
commit 1f7d060893
8 changed files with 28 additions and 24 deletions

4
debian/changelog vendored
View file

@ -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-select-session: allow for default selection of session 1
* usr/bin/byobu-config: prevent the user from changing the escape sequence * usr/bin/byobu-config: prevent the user from changing the escape sequence
to / or \, both of which cause problems, LP: #581533 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 <kirkland@ubuntu.com> Tue, 01 Jun 2010 10:53:54 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 01 Jun 2010 10:53:54 -0500

2
debian/manpages vendored
View file

@ -2,7 +2,7 @@ usr/share/man/man1/byobu-select-profile.1
usr/share/man/man1/byobu-launcher.1 usr/share/man/man1/byobu-launcher.1
usr/share/man/man1/byobu-reconnect-sockets.1 usr/share/man/man1/byobu-reconnect-sockets.1
usr/share/man/man1/byobu-status.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-export.1
usr/share/man/man1/byobu-config.1 usr/share/man/man1/byobu-config.1
usr/share/man/man1/byobu-status-detail.1 usr/share/man/man1/byobu-status-detail.1

View file

@ -58,12 +58,12 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%config %{_sysconfdir}/%{name}/* %config %{_sysconfdir}/%{name}/*
%{_bindir}/%{name}* %{_bindir}/%{name}*
%{_bindir}/motd+shell %{_bindir}/shell
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/* %{_datadir}/%{name}/*
%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
%{_mandir}/man1/%{name}*.1.gz %{_mandir}/man1/%{name}*.1.gz
%{_mandir}/man1/motd+shell.1.gz %{_mandir}/man1/shell.1.gz
%{_prefix}/lib/%{name}/* %{_prefix}/lib/%{name}/*
%changelog %changelog

View file

@ -52,8 +52,8 @@ else
fi fi
export BYOBU_WINDOWS export BYOBU_WINDOWS
# Launch motd+shell, unless the user has default windows set to launch # Launch shell, unless the user has default windows set to launch
grep -qs "^[^#]" "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="-t shell motd+shell" grep -qs "^[^#]" "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="shell"
# Check if our terminfo supports 256 colors # 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" [ -x /usr/bin/tput ] && [ $(/usr/bin/tput colors 2>/dev/null || echo 0) -eq 256 ] && SCREEN_TERM="-T screen-256color"

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# motd+shell # shell: display the MOTD and launch the default shell
# Copyright (C) 2008 Canonical Ltd. # Copyright (C) 2008 Canonical Ltd.
# #
# Authors: Dustin Kirkland <kirkland@canonical.com> # Authors: Dustin Kirkland <kirkland@canonical.com>

View file

@ -2,4 +2,4 @@
#screen -t notify-osd -M tail -f $HOME/.cache/notify-osd.log #screen -t notify-osd -M tail -f $HOME/.cache/notify-osd.log
#screen -t top top #screen -t top top
#screen -t web w3m #screen -t web w3m
#screen -t shell motd+shell #screen -t shell shell

View file

@ -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 <kirkland@canonical.com> 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.

View file

@ -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 <kirkland@canonical.com> 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.