From a4b424cda09b9b6a2ac3dddafd649e5a1c57b69f Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 5 May 2009 14:20:05 -0500 Subject: [PATCH] renaming project 'byobu' Massive change, touches every file. Signed-off-by: Dustin Kirkland --- README | 2 +- bin/ec2-cost | 2 +- bin/hostname | 2 +- bin/ip-address | 2 +- bin/logo | 2 +- bin/mem-available | 2 +- bin/network-down | 2 +- bin/network-up | 2 +- bin/updates-available | 2 +- screen => byobu | 6 +- screen-profiles => byobu-config | 4 +- screen-profiles.1 => byobu-config.1 | 16 ++-- screen-profiles-export => byobu-export | 2 +- screen-profiles-export.1 => byobu-export.1 | 12 +-- screen-profiles-status => byobu-status | 4 +- ...files-status-detail => byobu-status-detail | 4 +- ...s-status-detail.1 => byobu-status-detail.1 | 8 +- byobu-status.1 | 15 ++++ debian/byobu-extras.install | 1 + debian/changelog | 5 +- debian/control | 34 +++++--- debian/copyright | 2 +- debian/install | 31 ++++---- debian/postrm | 2 +- debian/preinst | 2 +- debian/release.sh | 2 +- debian/rules | 5 +- debian/screen-profiles-extras.install | 1 - doc/help.txt | 2 +- keybindings/common | 6 +- motd+shell.1 | 4 +- po/POTFILES.python | 2 +- po/POTFILES.sh | 2 +- po/{screen-profiles.pot => byobu.pot} | 78 +++++++++---------- po/es.po | 78 +++++++++---------- po/fr.po | 78 +++++++++---------- profiles/common | 50 ++++++------ profiles/profile.skel | 2 +- screen-launcher-install | 2 +- screen-launcher.1 | 8 +- screen-profiles-status.1 | 15 ---- select-screen-profile | 2 +- select-screen-profile.1 | 6 +- 43 files changed, 263 insertions(+), 246 deletions(-) rename screen => byobu (95%) rename screen-profiles => byobu-config (99%) rename screen-profiles.1 => byobu-config.1 (85%) rename screen-profiles-export => byobu-export (99%) rename screen-profiles-export.1 => byobu-export.1 (52%) rename screen-profiles-status => byobu-status (97%) rename screen-profiles-status-detail => byobu-status-detail (89%) rename screen-profiles-status-detail.1 => byobu-status-detail.1 (57%) create mode 100644 byobu-status.1 create mode 100644 debian/byobu-extras.install delete mode 100644 debian/screen-profiles-extras.install rename po/{screen-profiles.pot => byobu.pot} (61%) delete mode 100644 screen-profiles-status.1 diff --git a/README b/README index b15c36db..703dca8c 100644 --- a/README +++ b/README @@ -1,2 +1,2 @@ For more information about this package, please see: - * https://launchpad.net/screen-profiles + * https://launchpad.net/byobu diff --git a/bin/ec2-cost b/bin/ec2-cost index c48a7b27..cefcc90b 100755 --- a/bin/ec2-cost +++ b/bin/ec2-cost @@ -19,7 +19,7 @@ FORCE=0 DETAIL=0 -PKG="screen-profiles" +PKG="byobu" # Default is "off" p="ec2-cost" diff --git a/bin/hostname b/bin/hostname index bca3a866..81c8ca3f 100755 --- a/bin/hostname +++ b/bin/hostname @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" if [ "$1" = "--detail" ]; then hostname -f diff --git a/bin/ip-address b/bin/ip-address index 1ce13591..edbd4482 100755 --- a/bin/ip-address +++ b/bin/ip-address @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" if [ "$1" = "--detail" ]; then hostname -i diff --git a/bin/logo b/bin/logo index 43d5b73d..a0897e4c 100755 --- a/bin/logo +++ b/bin/logo @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" if [ "$1" = "--detail" ]; then MARKUP="false" diff --git a/bin/mem-available b/bin/mem-available index 5e56a1d8..3ada1789 100755 --- a/bin/mem-available +++ b/bin/mem-available @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" if [ "$1" = "--detail" ]; then free diff --git a/bin/network-down b/bin/network-down index 4c71ddd7..0f38a0b6 100755 --- a/bin/network-down +++ b/bin/network-down @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" cache="$HOME/.$PKG/network-down" interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"` diff --git a/bin/network-up b/bin/network-up index 891f24aa..e4e8ee8f 100755 --- a/bin/network-up +++ b/bin/network-up @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" cache="$HOME/.$PKG/network-up" diff --git a/bin/updates-available b/bin/updates-available index 869bce56..98af836a 100755 --- a/bin/updates-available +++ b/bin/updates-available @@ -29,7 +29,7 @@ if [ "$1" = "--detail" ]; then exit 0 fi -PKG="screen-profiles" +PKG="byobu" # expire the cache in X seconds; 1 hour by default EXPIRATION=3600 diff --git a/screen b/byobu similarity index 95% rename from screen rename to byobu index 36920573..28a6be64 100755 --- a/screen +++ b/byobu @@ -17,7 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +OLDPKG="screen-profiles" +PKG="byobu" + +# Upgrad old config dir to the new name +[ -d "$HOME/.$OLDKPG" -a ! -e "$HOME/.$PKG" ] && mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG" # Create the .$PKG directory, if it doesn't already exist [ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG" diff --git a/screen-profiles b/byobu-config similarity index 99% rename from screen-profiles rename to byobu-config index e1236209..7380c9e1 100755 --- a/screen-profiles +++ b/byobu-config @@ -1,6 +1,6 @@ #! /usr/bin/env python # -# screen-profiles +# byobu-config # Copyright (C) 2008 Canonical Ltd. # # Authors: Nick Barcet @@ -27,7 +27,7 @@ from ConfigParser import SafeConfigParser from snack import * HOME=os.getenv("HOME") -PKG="screen-profiles" +PKG="byobu" SHARE='/usr/share/'+PKG DOC='/usr/share/doc/'+PKG DEF_ESC="A" diff --git a/screen-profiles.1 b/byobu-config.1 similarity index 85% rename from screen-profiles.1 rename to byobu-config.1 index bcdbd306..7c423b9e 100644 --- a/screen-profiles.1 +++ b/byobu-config.1 @@ -1,15 +1,15 @@ -.TH screen\-profiles 1 "16 Jan 2009" screen-profiles "screen-profiles" +.TH byobu-config 1 "16 Jan 2009" byobu "byobu" .SH NAME -screen\-profiles \- Configuration utility for screen\-profiles +byobu-config \- Configuration utility for byobu .SH DESCRIPTION -\fBscreen\-profiles\fP is an application that can configure a number of options available in the screen\-profiles utility. +\fBbyobu\-config\fP is an application that can configure a number of options available in the byobu utility. -The menu provided by the \fBscreen\-profiles\fP should be self-explanatory. +The menu provided by the \fBbyobu\fP should be self-explanatory. .SH STATUS NOTIFICATIONS -\fBscreen\-profiles\fP supports a number of unique and interesting status notifications across the lowest two lines in the screen. Each status notification item is independently configurable, enabled and disabled by the configuration utilty. The guide below helps identify each status item (in alphabetical order): +\fBbyobu\fP supports a number of unique and interesting status notifications across the lowest two lines in the screen. Each status notification item is independently configurable, enabled and disabled by the configuration utilty. The guide below helps identify each status item (in alphabetical order): \fBarch\fP \- system architecture; displayed on the lower bar toward the left, in the default text color on the default background color @@ -29,13 +29,13 @@ The menu provided by the \fBscreen\-profiles\fP should be self-explanatory. \fBload-average\fP \- the system load average over the last 1 minute; displayed in the lower bar toward the right in black text on a yellow background -\fBlogo\fP \- an approximation of the current operating system's logo; displayed in the lower bar on the far left; you may customize this logo by setting a chosen logo in \fI$HOME/.screen-profiles/logo\fP, or you may manually choose your operating system by setting this in \fI$HOME/.screen-profiles/distro\fP +\fBlogo\fP \- an approximation of the current operating system's logo; displayed in the lower bar on the far left; you may customize this logo by setting a chosen logo in \fI$HOME/.byobu/logo\fP, or you may manually choose your operating system by setting this in \fI$HOME/.byobu/distro\fP \fBmem-available\fP \- total memory available in the system; displayed in the lower bar toward the right in white text on a green background \fBmem-used\fP \- total memory used in the system as a percentage of the total memory available; displayed in the lower bar toward the right in white text on a green background with a trailing '%' sign -\fBmenu\fP \- a simple indicator directing new users to use the F9 keybinding to access the screen\-profiles menu +\fBmenu\fP \- a simple indicator directing new users to use the F9 keybinding to access the byobu menu \fBnetwork-down\fP \- instaneous download bandwidth in kB/s over the last 2 seconds; displayed in the lower bar toward the right in white text on a purple background with a leading 'v' sign indicating 'down' @@ -72,7 +72,7 @@ PuTTY users have reported that the F2, F3, and F4 shortcut keys are not working \fBscreen\fP(1) .TP -\fIhttp://launchpad.net/screen-profiles\fP +\fIhttp://launchpad.net/byobu\fP .PD .SH AUTHOR diff --git a/screen-profiles-export b/byobu-export similarity index 99% rename from screen-profiles-export rename to byobu-export index b96c2f5f..84b6facc 100755 --- a/screen-profiles-export +++ b/byobu-export @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" SHARE="/usr/share/$PKG" DIR=`mktemp -t -d $PKG.XXXXXXXX` || error "Could not create a temporary directory" # Grab list of available colors diff --git a/screen-profiles-export.1 b/byobu-export.1 similarity index 52% rename from screen-profiles-export.1 rename to byobu-export.1 index 5e5f498d..ad1a60b6 100644 --- a/screen-profiles-export.1 +++ b/byobu-export.1 @@ -1,9 +1,9 @@ -.TH screen\-launcher 1 "28 Mar 2009" screen-profiles-export "screen-profiles" +.TH screen\-launcher 1 "28 Mar 2009" byobu "byobu" .SH NAME -screen\-profiles\-export \- create a screen-profiles archive for export +byobu\-export \- create a byobu archive for export .SH SYNOPSIS -.BI "screen\-profiles\-export [\-c COLOR] \-f TARGET.tar.gz" +.BI "byobu\-export [\-c COLOR] \-f TARGET.tar.gz" .SH OPTIONS .TP @@ -14,15 +14,15 @@ Optional parameter specifying the desired color scheme. If omitted, the program If TARGET.tar.gz is unspecified, a randomly generated filename will be used. .SH DESCRIPTION -\fBscreen\-profiles\-export\fP is a program that creates a monolithic .screenrc profile, and copies the status notification scripts into an archive file. This archive can then be extracted on a target system where \fBscreen\-profiles\fP is not installed (perhaps because the program is not packaged for that distribution, or perhaps because the administrator has not installed the package). +\fBbyobu\-export\fP is a program that creates a monolithic .screenrc profile, and copies the status notification scripts into an archive file. This archive can then be extracted on a target system where \fBbyobu\fP is not installed (perhaps because the program is not packaged for that distribution, or perhaps because the administrator has not installed the package). .SH "SEE ALSO" .PD 0 .TP -\fBscreen\fP(1), \fBscreen\-profiles\fP(1) +\fBscreen\fP(1), \fBbyobu\fP(1) .TP -\fIhttp://launchpad.net/screen-profiles\fP +\fIhttp://launchpad.net/byobu\fP .PD .SH AUTHOR diff --git a/screen-profiles-status b/byobu-status similarity index 97% rename from screen-profiles-status rename to byobu-status index 5c0ec311..2e543e45 100755 --- a/screen-profiles-status +++ b/byobu-status @@ -1,6 +1,6 @@ #!/bin/sh -e # -# screen-profiles-status +# byobu-status # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland @@ -26,7 +26,7 @@ # but not at screen startup. ########################################################### -PKG="screen-profiles" +PKG="byobu" if [ -d "$HOME/.$PKG/bin" ]; then DIR="$HOME/.$PKG/bin" diff --git a/screen-profiles-status-detail b/byobu-status-detail similarity index 89% rename from screen-profiles-status-detail rename to byobu-status-detail index 8e586123..633dc7e6 100755 --- a/screen-profiles-status-detail +++ b/byobu-status-detail @@ -1,6 +1,6 @@ #!/bin/sh # -# screen-profiles-status-detail +# byobu-status-detail # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland @@ -18,4 +18,4 @@ # along with this program. If not, see . -screen-profiles-status --detail | less -R -p "#.*:$" +byobu-status --detail | less -R -p "#.*:$" diff --git a/screen-profiles-status-detail.1 b/byobu-status-detail.1 similarity index 57% rename from screen-profiles-status-detail.1 rename to byobu-status-detail.1 index 4fc9176e..b213950c 100644 --- a/screen-profiles-status-detail.1 +++ b/byobu-status-detail.1 @@ -1,12 +1,12 @@ -.TH screen-profiles-status-detail 1 "27 Apr 2009" screen-profiles "screen-profiles" +.TH byobu-status-detail 1 "27 Apr 2009" byobu "byobu" .SH NAME -screen\-profiles\-status\-detail \- Wrapper that uses a sensible pager +byobu\-status\-detail \- Wrapper that uses a sensible pager .SH DESCRIPTION -\fBscreen\-profiles\-status\-detail\fP is a simple script that uses a sensible pager for displaying the detailed status of all screen\-profiles status scripts. +\fBbyobu\-status\-detail\fP is a simple script that uses a sensible pager for displaying the detailed status of all byobu status scripts. .TP -\fIhttp://launchpad.net/screen-profiles\fP +\fIhttp://launchpad.net/byobu\fP .PD .SH AUTHOR diff --git a/byobu-status.1 b/byobu-status.1 new file mode 100644 index 00000000..2bc39a1d --- /dev/null +++ b/byobu-status.1 @@ -0,0 +1,15 @@ +.TH byobu-status 1 "21 Apr 2009" byobu "byobu" +.SH NAME +byobu\-status \- Common starting point for running byobu status commands + +.SH DESCRIPTION +\fBbyobu\-status\fP is a simple script that takes a single argument: a script defined in /usr/lib/byobu. This wrapper is useful for doing some common functionality, like setting the cpu and/or io proirity, determining sane defaults, pre/post processing. + +.TP +\fIhttp://launchpad.net/byobu\fP +.PD + +.SH AUTHOR +This manpage and the \fBbyobu\-status\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/debian/byobu-extras.install b/debian/byobu-extras.install new file mode 100644 index 00000000..0accf63f --- /dev/null +++ b/debian/byobu-extras.install @@ -0,0 +1 @@ +profiles/*_* usr/share/byobu/profiles diff --git a/debian/changelog b/debian/changelog index 26421f58..7840113c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -screen-profiles (1.55) jaunty; urgency=low +byobu (2.0) karmic; urgency=low + Renaming project screen-profiles to byobu * bin/users: make the --detail output match the status output * bin/ec2-cost, bin/hostname, bin/ip-address, bin/logo, bin/mem-available, bin/network-down, bin/network-up, @@ -9,7 +10,7 @@ screen-profiles (1.55) jaunty; urgency=low select-screen-profile: abstract the package name (currently, screen-profiles) to a variable - -- Dustin Kirkland Tue, 05 May 2009 13:04:06 -0500 + -- Dustin Kirkland Tue, 05 May 2009 14:05:23 -0500 screen-profiles (1.54-0ubuntu1) karmic; urgency=low diff --git a/debian/control b/debian/control index fd9eb1a8..faa446b4 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,20 @@ -Source: screen-profiles +Source: byobu Section: misc Priority: optional Maintainer: Dustin Kirkland Standards-Version: 3.8.0 Build-Depends: debhelper (>= 6), gettext-base -Homepage: http://launchpad.net/screen-profiles -Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/screen-profiles/trunk +Homepage: http://launchpad.net/byobu +Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/byobu/trunk -Package: screen-profiles +Package: byobu Architecture: all Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11) Recommends: update-notifier-common, lsb-release -Suggests: screen-profiles-extras +Suggests: byobu-extras Enhances: screen Description: a set of useful profiles and a profile-switcher for GNU screen - screen-profiles includes a set of profiles for the GNU screen window manager. + byobu includes a set of profiles for the GNU screen window manager. These profiles are quite useful on server machines which are not running a graphical desktop. The 'screen' command provides a number of advanced features are not necessarily exposed in the default profile. These profiles @@ -25,10 +25,22 @@ Description: a set of useful profiles and a profile-switcher for GNU screen update-notifier-common provides a more efficient and standard mechanism for calculating the number of updates available in the status panel. +Package: byobu-extras +Architecture: all +Depends: ${misc:Depends}, byobu +Description: additional colored profiles for the byobu package + The byobu contains a basic set of light and dark profiles. + The byobu-extras package provides additional profiles of various + different light and dark colors. + +Package: screen-profiles +Architecture: all +Depends: ${misc:Depends}, byobu +Description: package has been renamed to byobu + The screen-profiles package has been renamed to 'byobu'. + Package: screen-profiles-extras Architecture: all -Depends: ${misc:Depends}, screen-profiles -Description: additional colored profiles for the screen-profiles package - The screen-profiles package contains a basic set of light and dark profiles. - The screen-profiles-extras package provides additional profiles of various - different light and dark colors. +Depends: ${misc:Depends}, byobu-extras +Description: package has been renamed to byobu-extras + The screen-profiles-extras package has been renamed to 'byobu-extras'. diff --git a/debian/copyright b/debian/copyright index a449b431..deeb45fe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Dustin Kirkland Sun, 14 Dec 2008 13:11:37 -0600 -It was downloaded from: http://launchpad.net/screen-profiles +It was downloaded from: http://launchpad.net/byobu Upstream Authors: Dustin Kirkland diff --git a/debian/install b/debian/install index 38f594eb..b5746702 100644 --- a/debian/install +++ b/debian/install @@ -1,20 +1,19 @@ -bin/* usr/lib/screen-profiles +bin/* usr/lib/byobu po/locale/* usr/share/locale -profiles/common usr/share/screen-profiles/profiles -profiles/NONE usr/share/screen-profiles/profiles -profiles/black usr/share/screen-profiles/profiles -profiles/dark usr/share/screen-profiles/profiles -profiles/light usr/share/screen-profiles/profiles -keybindings/common usr/share/screen-profiles/keybindings -keybindings/none usr/share/screen-profiles/keybindings -windows/common usr/share/screen-profiles/windows -screen usr/bin +profiles/common usr/share/byobu/profiles +profiles/NONE usr/share/byobu/profiles +profiles/black usr/share/byobu/profiles +profiles/dark usr/share/byobu/profiles +profiles/light usr/share/byobu/profiles +keybindings/common usr/share/byobu/keybindings +keybindings/none usr/share/byobu/keybindings +windows/common usr/share/byobu/windows select-screen-profile usr/bin -screen-profiles usr/bin -screen-profiles-status usr/bin -screen-profiles-status-detail usr/bin -screen-launcher-install usr/share/screen-profiles -screen-launcher-uninstall usr/share/screen-profiles +byobu-config usr/bin +byobu-status usr/bin +byobu-status-detail usr/bin +screen-launcher-install usr/share/byobu +screen-launcher-uninstall usr/share/byobu motd+shell usr/bin screen-launcher usr/bin -screen-profiles-export usr/bin +byobu-export usr/bin diff --git a/debian/postrm b/debian/postrm index 7ee4de6b..e324238b 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,6 +1,6 @@ #!/bin/sh -e -PKG="screen-profiles" +PKG="byobu" if [ "$1" = "remove" ]; then dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen diff --git a/debian/preinst b/debian/preinst index 86b6c90f..2962c268 100644 --- a/debian/preinst +++ b/debian/preinst @@ -1,6 +1,6 @@ #!/bin/sh -e -PKG="screen-profiles" +PKG="byobu" if [ "install" = "$1" ] || [ "upgrade" = "$1" ]; then dpkg-divert --package "$PKG" --divert /usr/bin/screen.real --rename /usr/bin/screen diff --git a/debian/release.sh b/debian/release.sh index a23b2525..ab9bc93c 100755 --- a/debian/release.sh +++ b/debian/release.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -PKG="screen-profiles" +PKG="byobu" error() { echo "ERROR: $@" diff --git a/debian/rules b/debian/rules index f7af7592..12e79490 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -PKG=screen-profiles +PKG=byobu VER=`head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//'` get-orig-source: @@ -49,6 +49,7 @@ install: build install-po dh_testroot dh_clean -k dh_install -X.bzr + dh_link usr/bin/byobu usr/bin/screen # Everything else is handled by dh_install @@ -57,7 +58,7 @@ binary-indep: build install dh_testdir -i dh_testroot -i dh_installdocs -X.bzr -i - dh_installman -i screen-launcher.1 screen-profiles.1 select-screen-profile.1 motd+shell.1 screen-profiles-export.1 screen-profiles-status.1 screen-profiles-status-detail.1 + dh_installman -i screen-launcher.1 byobu-config.1 select-screen-profile.1 motd+shell.1 byobu-export.1 byobu-status.1 byobu-status-detail.1 dh_installchangelogs -i dh_installdebconf -i dh_compress -i diff --git a/debian/screen-profiles-extras.install b/debian/screen-profiles-extras.install deleted file mode 100644 index d64031f9..00000000 --- a/debian/screen-profiles-extras.install +++ /dev/null @@ -1 +0,0 @@ -profiles/*_* usr/share/screen-profiles/profiles diff --git a/doc/help.txt b/doc/help.txt index 72c2e926..235c070f 100644 --- a/doc/help.txt +++ b/doc/help.txt @@ -7,7 +7,7 @@ updates-available, system-load, cpu-info, memory-info, and date/time. F2 Create a new window | F6 Detach from the session F3 Go to the prev window | F7 Enter scrollback mode F4 Go to the next window | F8 Re-title a window -F5 Reload profile | F9 Configure screen-profiles +F5 Reload profile | F9 Configuration | F12 Lock this terminal 'screen -r' - reattach | 'man screen' - complete help | > Escape sequence diff --git a/keybindings/common b/keybindings/common index 3bcc0ee7..98da1c02 100644 --- a/keybindings/common +++ b/keybindings/common @@ -35,14 +35,14 @@ register n "^a^c" # | Goes with the F2 definition bindkey -k k2 process n # F2 | Create new window bindkey -k k3 prev # F3 | Previous Window bindkey -k k4 next # F4 | Next Window -register r "^a:source $HOME/.screen-profiles/profile^M" # | Goes with F5 definition +register r "^a:source $HOME/.byobu/profile^M" # | Goes with F5 definition bindkey -k k5 process r # F5 | Reload profile bindkey -k k6 detach # F6 | Detach from this session bindkey -k k7 copy # F7 | Enter copy/scrollback mode register t "^aA^aa^k^h" # | Goes with the F8 definition bindkey -k k8 process t # F8 | Re-title a window -bindkey -k k9 screen -t help 0 screen-profiles # F9 | Configuration +bindkey -k k9 screen -t help 0 byobu-config # F9 | Configuration # F10 | 'toolbar' in gnome-terminal # F11 | 'fullscreen' in gnome-terminal bindkey -k F2 lockscreen # F12 | Lock this terminal -bind $ screen -t status 0 screen-profiles-status-detail # ctrl-a $ | show detailed status +bind $ screen -t status 0 byobu-status-detail # ctrl-a $ | show detailed status diff --git a/motd+shell.1 b/motd+shell.1 index ae0efb15..b1b7d0c7 100644 --- a/motd+shell.1 +++ b/motd+shell.1 @@ -1,4 +1,4 @@ -.TH motd+shell 1 "11 Feb 2009" screen-profiles "screen-profiles" +.TH motd+shell 1 "11 Feb 2009" byobu "byobu" .SH NAME motd+shell \- Print the message of the day and launch a shell @@ -8,7 +8,7 @@ motd+shell \- Print the message of the day and launch a shell $SHELL will be invoked if it exists. Otherwise, /bin/sh will be used. .TP -\fIhttp://launchpad.net/screen-profiles\fP +\fIhttp://launchpad.net/byobu\fP .PD .SH AUTHOR diff --git a/po/POTFILES.python b/po/POTFILES.python index e9d8cb3e..78e588ee 100644 --- a/po/POTFILES.python +++ b/po/POTFILES.python @@ -1,3 +1,3 @@ # List of source files containing translatable Python strings. # Please keep this file sorted alphabetically. -screen-profiles +byobu-config diff --git a/po/POTFILES.sh b/po/POTFILES.sh index 4923c92c..36eb30e4 100644 --- a/po/POTFILES.sh +++ b/po/POTFILES.sh @@ -1,5 +1,5 @@ # List of source files containing translatable sh strings. # Please keep this file sorted alphabetically. bin/menu +byobu-export select-screen-profile -screen-profiles-export diff --git a/po/screen-profiles.pot b/po/byobu.pot similarity index 61% rename from po/screen-profiles.pot rename to po/byobu.pot index 89bc33cb..d8ff960b 100644 --- a/po/screen-profiles.pot +++ b/po/byobu.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: screen-profiles:306 +#: byobu-config:306 #, fuzzy msgid "" msgstr "" @@ -17,136 +17,136 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: screen-profiles:71 +#: byobu-config:71 msgid "Remove screen by default at login" msgstr "" -#: screen-profiles:73 +#: byobu-config:73 msgid "Install screen by default at login" msgstr "" -#: screen-profiles:77 +#: byobu-config:77 msgid "Help" msgstr "" -#: screen-profiles:78 +#: byobu-config:78 msgid "Change screen profile" msgstr "" -#: screen-profiles:79 +#: byobu-config:79 msgid "Toggle status notifications" msgstr "" -#: screen-profiles:80 +#: byobu-config:80 msgid "Change keybinding set" msgstr "" -#: screen-profiles:81 +#: byobu-config:81 msgid "Change escape sequence" msgstr "" -#: screen-profiles:82 +#: byobu-config:82 msgid "Create new window(s)" msgstr "" -#: screen-profiles:83 +#: byobu-config:83 msgid "Manage default windows" msgstr "" -#: screen-profiles:85 +#: byobu-config:85 msgid "Exit" msgstr "" -#: screen-profiles:87 screen-profiles:472 +#: byobu-config:87 byobu-config:472 msgid " Screen Profiles Configuration Menu" msgstr "" -#: screen-profiles:98 +#: byobu-config:98 msgid "Okay" msgstr "" -#: screen-profiles:98 screen-profiles:134 screen-profiles:150 -#: screen-profiles:185 screen-profiles:313 screen-profiles:355 -#: screen-profiles:433 +#: byobu-config:98 byobu-config:134 byobu-config:150 +#: byobu-config:185 byobu-config:313 byobu-config:355 +#: byobu-config:433 msgid "Cancel" msgstr "" -#: screen-profiles:116 screen-profiles:143 screen-profiles:157 -#: screen-profiles:326 screen-profiles:380 screen-profiles:388 -#: screen-profiles:461 +#: byobu-config:116 byobu-config:143 byobu-config:157 +#: byobu-config:326 byobu-config:380 byobu-config:388 +#: byobu-config:461 msgid "Menu" msgstr "" -#: screen-profiles:117 +#: byobu-config:117 msgid "Screen Profiles Help" msgstr "" -#: screen-profiles:134 screen-profiles:150 screen-profiles:185 -#: screen-profiles:313 screen-profiles:355 screen-profiles:433 +#: byobu-config:134 byobu-config:150 byobu-config:185 +#: byobu-config:313 byobu-config:355 byobu-config:433 msgid "Apply" msgstr "" -#: screen-profiles:136 +#: byobu-config:136 msgid "Which profile would you like to use?" msgstr "" -#: screen-profiles:142 screen-profiles:156 screen-profiles:325 -#: screen-profiles:387 screen-profiles:459 +#: byobu-config:142 byobu-config:156 byobu-config:325 +#: byobu-config:387 byobu-config:459 msgid "Message" msgstr "" -#: screen-profiles:151 +#: byobu-config:151 msgid "Which set of keybindings would you like to use?" msgstr "" -#: screen-profiles:165 +#: byobu-config:165 msgid "Title: " msgstr "" -#: screen-profiles:167 +#: byobu-config:167 msgid "Command: " msgstr "" -#: screen-profiles:169 +#: byobu-config:169 msgid "Presets: " msgstr "" -#: screen-profiles:183 +#: byobu-config:183 msgid "Add to default windows" msgstr "" -#: screen-profiles:187 +#: byobu-config:187 msgid "Create new window(s):" msgstr "" -#: screen-profiles:314 +#: byobu-config:314 msgid "Toggle status notifications:" msgstr "" -#: screen-profiles:347 +#: byobu-config:347 msgid "Windows:" msgstr "" -#: screen-profiles:357 +#: byobu-config:357 msgid "Select window(s) to create by default:" msgstr "" -#: screen-profiles:377 +#: byobu-config:377 msgid "Screen will be launched automatically next time you login." msgstr "" -#: screen-profiles:385 +#: byobu-config:385 msgid "Screen will not be used next time you login." msgstr "" -#: screen-profiles:432 +#: byobu-config:432 msgid "Escape key: ctrl-" msgstr "" -#: screen-profiles:435 +#: byobu-config:435 msgid "Change escape sequence:" msgstr "" -#: screen-profiles:473 +#: byobu-config:473 msgid "/ between elements | Validates" msgstr "" diff --git a/po/es.po b/po/es.po index d1051059..5adf44b5 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the GNU Screen Profiles package. # Nicolas Valcarcel , 2008. # -#: screen-profiles:306 +#: byobu-config:306 #, fuzzy msgid "" msgstr "" @@ -17,137 +17,137 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: screen-profiles:71 +#: byobu-config:71 msgid "Remove screen by default at login" msgstr "" -#: screen-profiles:73 +#: byobu-config:73 msgid "Install screen by default at login" msgstr "" -#: screen-profiles:77 +#: byobu-config:77 msgid "Help" msgstr "" -#: screen-profiles:78 +#: byobu-config:78 msgid "Change screen profile" msgstr "" -#: screen-profiles:79 +#: byobu-config:79 msgid "Toggle status notifications" msgstr "" -#: screen-profiles:80 +#: byobu-config:80 msgid "Change keybinding set" msgstr "" -#: screen-profiles:81 +#: byobu-config:81 msgid "Change escape sequence" msgstr "" -#: screen-profiles:82 +#: byobu-config:82 msgid "Create new window(s)" msgstr "" -#: screen-profiles:83 +#: byobu-config:83 msgid "Manage default windows" msgstr "" -#: screen-profiles:85 +#: byobu-config:85 msgid "Exit" msgstr "" -#: screen-profiles:87 screen-profiles:472 +#: byobu-config:87 byobu-config:472 msgid " Screen Profiles Configuration Menu" msgstr "" -#: screen-profiles:98 +#: byobu-config:98 msgid "Okay" msgstr "" -#: screen-profiles:98 screen-profiles:134 screen-profiles:150 -#: screen-profiles:185 screen-profiles:313 screen-profiles:355 -#: screen-profiles:433 +#: byobu-config:98 byobu-config:134 byobu-config:150 +#: byobu-config:185 byobu-config:313 byobu-config:355 +#: byobu-config:433 msgid "Cancel" msgstr "" -#: screen-profiles:116 screen-profiles:143 screen-profiles:157 -#: screen-profiles:326 screen-profiles:380 screen-profiles:388 -#: screen-profiles:461 +#: byobu-config:116 byobu-config:143 byobu-config:157 +#: byobu-config:326 byobu-config:380 byobu-config:388 +#: byobu-config:461 msgid "Menu" msgstr "" -#: screen-profiles:117 +#: byobu-config:117 msgid "Screen Profiles Help" msgstr "" -#: screen-profiles:134 screen-profiles:150 screen-profiles:185 -#: screen-profiles:313 screen-profiles:355 screen-profiles:433 +#: byobu-config:134 byobu-config:150 byobu-config:185 +#: byobu-config:313 byobu-config:355 byobu-config:433 msgid "Apply" msgstr "" -#: screen-profiles:136 +#: byobu-config:136 msgid "Which profile would you like to use?" msgstr "" -#: screen-profiles:142 screen-profiles:156 screen-profiles:325 -#: screen-profiles:387 screen-profiles:459 +#: byobu-config:142 byobu-config:156 byobu-config:325 +#: byobu-config:387 byobu-config:459 msgid "Message" msgstr "" -#: screen-profiles:151 +#: byobu-config:151 msgid "Which set of keybindings would you like to use?" msgstr "" -#: screen-profiles:165 +#: byobu-config:165 msgid "Title: " msgstr "" -#: screen-profiles:167 +#: byobu-config:167 msgid "Command: " msgstr "" -#: screen-profiles:169 +#: byobu-config:169 msgid "Presets: " msgstr "" -#: screen-profiles:183 +#: byobu-config:183 msgid "Add to default windows" msgstr "" -#: screen-profiles:187 +#: byobu-config:187 msgid "Create new window(s):" msgstr "" -#: screen-profiles:314 +#: byobu-config:314 msgid "Toggle status notifications:" msgstr "" -#: screen-profiles:347 +#: byobu-config:347 msgid "Windows:" msgstr "" -#: screen-profiles:357 +#: byobu-config:357 msgid "Select window(s) to create by default:" msgstr "" -#: screen-profiles:377 +#: byobu-config:377 msgid "Screen will be launched automatically next time you login." msgstr "" -#: screen-profiles:385 +#: byobu-config:385 msgid "Screen will not be used next time you login." msgstr "" -#: screen-profiles:432 +#: byobu-config:432 msgid "Escape key: ctrl-" msgstr "" -#: screen-profiles:435 +#: byobu-config:435 msgid "Change escape sequence:" msgstr "" -#: screen-profiles:473 +#: byobu-config:473 msgid "/ between elements | Validates" msgstr "" diff --git a/po/fr.po b/po/fr.po index f4e247f0..a5047f05 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the GNU Screen Profiles package. # Nicolas Barcet , 2008. # -#: screen-profiles:306 +#: byobu-config:306 #, fuzzy msgid "" msgstr "" @@ -17,137 +17,137 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: screen-profiles:71 +#: byobu-config:71 msgid "Remove screen by default at login" msgstr "" -#: screen-profiles:73 +#: byobu-config:73 msgid "Install screen by default at login" msgstr "" -#: screen-profiles:77 +#: byobu-config:77 msgid "Help" msgstr "" -#: screen-profiles:78 +#: byobu-config:78 msgid "Change screen profile" msgstr "" -#: screen-profiles:79 +#: byobu-config:79 msgid "Toggle status notifications" msgstr "" -#: screen-profiles:80 +#: byobu-config:80 msgid "Change keybinding set" msgstr "" -#: screen-profiles:81 +#: byobu-config:81 msgid "Change escape sequence" msgstr "" -#: screen-profiles:82 +#: byobu-config:82 msgid "Create new window(s)" msgstr "" -#: screen-profiles:83 +#: byobu-config:83 msgid "Manage default windows" msgstr "" -#: screen-profiles:85 +#: byobu-config:85 msgid "Exit" msgstr "" -#: screen-profiles:87 screen-profiles:472 +#: byobu-config:87 byobu-config:472 msgid " Screen Profiles Configuration Menu" msgstr "" -#: screen-profiles:98 +#: byobu-config:98 msgid "Okay" msgstr "" -#: screen-profiles:98 screen-profiles:134 screen-profiles:150 -#: screen-profiles:185 screen-profiles:313 screen-profiles:355 -#: screen-profiles:433 +#: byobu-config:98 byobu-config:134 byobu-config:150 +#: byobu-config:185 byobu-config:313 byobu-config:355 +#: byobu-config:433 msgid "Cancel" msgstr "" -#: screen-profiles:116 screen-profiles:143 screen-profiles:157 -#: screen-profiles:326 screen-profiles:380 screen-profiles:388 -#: screen-profiles:461 +#: byobu-config:116 byobu-config:143 byobu-config:157 +#: byobu-config:326 byobu-config:380 byobu-config:388 +#: byobu-config:461 msgid "Menu" msgstr "" -#: screen-profiles:117 +#: byobu-config:117 msgid "Screen Profiles Help" msgstr "" -#: screen-profiles:134 screen-profiles:150 screen-profiles:185 -#: screen-profiles:313 screen-profiles:355 screen-profiles:433 +#: byobu-config:134 byobu-config:150 byobu-config:185 +#: byobu-config:313 byobu-config:355 byobu-config:433 msgid "Apply" msgstr "" -#: screen-profiles:136 +#: byobu-config:136 msgid "Which profile would you like to use?" msgstr "" -#: screen-profiles:142 screen-profiles:156 screen-profiles:325 -#: screen-profiles:387 screen-profiles:459 +#: byobu-config:142 byobu-config:156 byobu-config:325 +#: byobu-config:387 byobu-config:459 msgid "Message" msgstr "" -#: screen-profiles:151 +#: byobu-config:151 msgid "Which set of keybindings would you like to use?" msgstr "" -#: screen-profiles:165 +#: byobu-config:165 msgid "Title: " msgstr "" -#: screen-profiles:167 +#: byobu-config:167 msgid "Command: " msgstr "" -#: screen-profiles:169 +#: byobu-config:169 msgid "Presets: " msgstr "" -#: screen-profiles:183 +#: byobu-config:183 msgid "Add to default windows" msgstr "" -#: screen-profiles:187 +#: byobu-config:187 msgid "Create new window(s):" msgstr "" -#: screen-profiles:314 +#: byobu-config:314 msgid "Toggle status notifications:" msgstr "" -#: screen-profiles:347 +#: byobu-config:347 msgid "Windows:" msgstr "" -#: screen-profiles:357 +#: byobu-config:357 msgid "Select window(s) to create by default:" msgstr "" -#: screen-profiles:377 +#: byobu-config:377 msgid "Screen will be launched automatically next time you login." msgstr "" -#: screen-profiles:385 +#: byobu-config:385 msgid "Screen will not be used next time you login." msgstr "" -#: screen-profiles:432 +#: byobu-config:432 msgid "Escape key: ctrl-" msgstr "" -#: screen-profiles:435 +#: byobu-config:435 msgid "Change escape sequence:" msgstr "" -#: screen-profiles:473 +#: byobu-config:473 msgid "/ between elements | Validates" msgstr "" diff --git a/profiles/common b/profiles/common index fdc4b16f..f569d52c 100644 --- a/profiles/common +++ b/profiles/common @@ -26,30 +26,30 @@ vbell off msgwait 1 # Define status commands -backtick 99 86400 86400 screen-profiles-status logo -backtick 100 3600 3600 screen-profiles-status release -backtick 101 10 10 screen-profiles-status updates-available -backtick 102 2 2 screen-profiles-status reboot-required -backtick 103 2 2 screen-profiles-status cpu-freq -backtick 104 86400 86400 screen-profiles-status cpu-count -backtick 105 86400 86400 screen-profiles-status mem-available -backtick 106 2 2 screen-profiles-status load-average -backtick 107 2 2 screen-profiles-status mem-used -backtick 108 600 600 screen-profiles-status ec2-cost -backtick 109 3600 3600 screen-profiles-status hostname -backtick 110 86400 86400 screen-profiles-status whoami -backtick 111 86400 86400 screen-profiles-status menu -backtick 112 86400 86400 screen-profiles-status arch -backtick 113 30 30 screen-profiles-status battery -backtick 114 10 10 screen-profiles-status users -backtick 115 60 60 screen-profiles-status uptime -backtick 116 2 2 screen-profiles-status processes -backtick 117 2 2 screen-profiles-status network-up -backtick 118 2 2 screen-profiles-status network-down -backtick 119 2 2 screen-profiles-status wifi-quality -backtick 120 86400 86400 screen-profiles-status date -backtick 121 86400 86400 screen-profiles-status time -backtick 122 3600 3600 screen-profiles-status ip-address +backtick 99 86400 86400 byobu-status logo +backtick 100 3600 3600 byobu-status release +backtick 101 10 10 byobu-status updates-available +backtick 102 2 2 byobu-status reboot-required +backtick 103 2 2 byobu-status cpu-freq +backtick 104 86400 86400 byobu-status cpu-count +backtick 105 86400 86400 byobu-status mem-available +backtick 106 2 2 byobu-status load-average +backtick 107 2 2 byobu-status mem-used +backtick 108 600 600 byobu-status ec2-cost +backtick 109 3600 3600 byobu-status hostname +backtick 110 86400 86400 byobu-status whoami +backtick 111 86400 86400 byobu-status menu +backtick 112 86400 86400 byobu-status arch +backtick 113 30 30 byobu-status battery +backtick 114 10 10 byobu-status users +backtick 115 60 60 byobu-status uptime +backtick 116 2 2 byobu-status processes +backtick 117 2 2 byobu-status network-up +backtick 118 2 2 byobu-status network-down +backtick 119 2 2 byobu-status wifi-quality +backtick 120 86400 86400 byobu-status date +backtick 121 86400 86400 byobu-status time +backtick 122 3600 3600 byobu-status ip-address hardstatus alwayslastline @@ -61,4 +61,4 @@ altscreen on # Log 10000 lines defscrollback 10000 -source $HOME/.screen-profiles/keybindings +source $HOME/.byobu/keybindings diff --git a/profiles/profile.skel b/profiles/profile.skel index 76952327..1d1682ae 100644 --- a/profiles/profile.skel +++ b/profiles/profile.skel @@ -20,7 +20,7 @@ # along with this program. If not, see . ############################################################################### -source /usr/share/screen-profiles/profiles/common +source /usr/share/byobu/profiles/common # Window tabs, second to last line caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{= Wk}%110`%109`%122`%111`" diff --git a/screen-launcher-install b/screen-launcher-install index 4e0abec5..b5904fa9 100755 --- a/screen-launcher-install +++ b/screen-launcher-install @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -PKG="screen-profiles" +PKG="byobu" install_screen_launcher() { dest=$1 diff --git a/screen-launcher.1 b/screen-launcher.1 index 59969e24..9dc61d7b 100644 --- a/screen-launcher.1 +++ b/screen-launcher.1 @@ -1,19 +1,19 @@ -.TH screen\-launcher 1 "16 Jan 2009" screen-profiles "screen-profiles" +.TH screen\-launcher 1 "16 Jan 2009" byobu "byobu" .SH NAME screen\-launcher \- Screen Launcher .SH DESCRIPTION \fBscreen\-launcher\fP is a simple application that will launch "screen", reconnecting to an existing detached session (if available). -This script exists for simple insertion and removal from a user's $HOME/.screenrc file, by the \fBscreen\-profiles\fP utility. +This script exists for simple insertion and removal from a user's $HOME/.screenrc file, by the \fBbyobu\fP utility. .SH "SEE ALSO" .PD 0 .TP -\fBscreen\fP(1), \fBscreen\-profiles\fP(1) +\fBscreen\fP(1), \fBbyobu\fP(1) .TP -\fIhttp://launchpad.net/screen-profiles\fP +\fIhttp://launchpad.net/byobu\fP .PD .SH AUTHOR diff --git a/screen-profiles-status.1 b/screen-profiles-status.1 deleted file mode 100644 index 5f07682f..00000000 --- a/screen-profiles-status.1 +++ /dev/null @@ -1,15 +0,0 @@ -.TH screen-profiles-status 1 "21 Apr 2009" screen-profiles "screen-profiles" -.SH NAME -screen\-profiles\-status \- Common starting point for running screen\-profiles status commands - -.SH DESCRIPTION -\fBscreen\-profiles\-status\fP is a simple script that takes a single argument: a script defined in /usr/lib/screen\-profiles. This wrapper is useful for doing some common functionality, like setting the cpu and/or io proirity, determining sane defaults, pre/post processing. - -.TP -\fIhttp://launchpad.net/screen-profiles\fP -.PD - -.SH AUTHOR -This manpage and the \fBscreen\-profiles\-status\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/select-screen-profile b/select-screen-profile index 5e913c76..5fdd7557 100755 --- a/select-screen-profile +++ b/select-screen-profile @@ -22,7 +22,7 @@ # If you change any strings, please generate localization information with: # ./debian/rules get-po -PKG="screen-profiles" +PKG="byobu" TEXTDOMAIN="$PKG" diff --git a/select-screen-profile.1 b/select-screen-profile.1 index ac05c9f7..9a22a998 100644 --- a/select-screen-profile.1 +++ b/select-screen-profile.1 @@ -1,11 +1,11 @@ -.TH select\-screen\-profile 1 "14 Dec 2008" screen-profiles "screen-profiles" +.TH select\-screen\-profile 1 "14 Dec 2008" byobu "byobu" .SH NAME select\-screen\-profile \- Screen Profile Selector .SH DESCRIPTION \fBselect\-screen\-profile\fP is an application that lists the available screen profiles on a system and prompts the user to select one. -The selected profile will be symbolically linked into the current user's $HOME/.screen-profiles/profile, if that file does not yet exist, or is currently a symbolic link. +The selected profile will be symbolically linked into the current user's $HOME/.byobu/profile, if that file does not yet exist, or is currently a symbolic link. .SH "SEE ALSO" .PD 0 @@ -13,7 +13,7 @@ The selected profile will be symbolically linked into the current user's $HOME/. \fBscreen\fP(1) .TP -\fIhttp://launchpad.net/screen-profiles\fP +\fIhttp://launchpad.net/byobu\fP .PD .SH AUTHOR