From 966796e476a78fef2fb8aa8ca57a59d7168dc884 Mon Sep 17 00:00:00 2001 From: Derek Carter Date: Fri, 7 Aug 2009 17:58:04 -0400 Subject: [PATCH 1/3] made rpm build properly on fedora 11 --- keybindings/common | 46 ++++++++++++++++++++++++++++++++++++++++++++++ rpm/byobu.spec | 16 +++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 keybindings/common diff --git a/keybindings/common b/keybindings/common new file mode 100644 index 00000000..c3f46252 --- /dev/null +++ b/keybindings/common @@ -0,0 +1,46 @@ +############################################################################### +# GNU Screen common keybindings +# This configuration profile is intended to be a common header of useful +# keybindings, included by other profiles. +# +# Copyright (C) 2008 Nick Barcet +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +############################################################################### + +# This file defines the common key bindings +# +# For a keybinding to live in the "common" area, it must be verified to +# work in at least: +# * gnome-terminal +# * console tty +# +# bindkey commands should be followed by a comment that will be used in the +# help file (one day). The command should be formated as: +# # | explanation + +# F-keys seem to work well in both gnome-terminal and tty consoles + # F1 | 'help' in gnome-terminal +register n "^a^c^aA" # | Goes with the F2 definition +bindkey -k k2 process n # F2 | Create new window (and name it) +bindkey -k k3 prev # F3 | Previous Window +bindkey -k k4 next # F4 | Next Window +register r "^a:source $HOME/.screen-profiles/profile" # | 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 +bindkey -k k8 help # F8 | Advanced help/keybindings +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 diff --git a/rpm/byobu.spec b/rpm/byobu.spec index 0296cfb3..3b533873 100644 --- a/rpm/byobu.spec +++ b/rpm/byobu.spec @@ -13,6 +13,12 @@ BuildArch: noarch BuildRequires: gettext Requires: screen, python >= 2.5, newt, gettext +%Description +Byobu is a Japanese term for decorative, multi-panel screens that serve as folding room dividers. +As an open source project, Byobu is an elegant enhancement of the otherwise functional, plain, +practical GNU Screen. Byobu includes an enhanced profile and configuration utilities for the GNU +screen window manager, such as toggle-able system status notifications. + # TODO # help.txt is in different locations under RPM/DEB # python 2.5 is not available on RHEL 5 @@ -22,7 +28,7 @@ Requires: screen, python >= 2.5, newt, gettext %build -profiles/generate +profiles_generator/generate %install @@ -34,6 +40,7 @@ mkdir -p ${RPM_BUILD_ROOT}/usr/share/byobu/profiles mkdir -p ${RPM_BUILD_ROOT}/usr/share/byobu/keybindings mkdir -p ${RPM_BUILD_ROOT}/usr/share/byobu/windows mkdir -p ${RPM_BUILD_ROOT}/usr/bin +mkdir -p ${RPM_BUILD_ROOT}/etc/byobu cp -ar bin/* ${RPM_BUILD_ROOT}/usr/lib/byobu cp -ar po/locale/* ${RPM_BUILD_ROOT}/usr/share/locale cp -ar profiles/byoburc ${RPM_BUILD_ROOT}/usr/share/byobu/profiles @@ -43,6 +50,7 @@ cp -ar profiles/black ${RPM_BUILD_ROOT}/usr/share/byobu/profiles cp -ar profiles/dark ${RPM_BUILD_ROOT}/usr/share/byobu/profiles cp -ar profiles/light ${RPM_BUILD_ROOT}/usr/share/byobu/profiles cp -ar keybindings/common ${RPM_BUILD_ROOT}/usr/share/byobu/keybindings +cp -ar keybindings/f-keys ${RPM_BUILD_ROOT}/usr/share/byobu/keybindings cp -ar keybindings/none ${RPM_BUILD_ROOT}/usr/share/byobu/keybindings cp -ar windows/common ${RPM_BUILD_ROOT}/usr/share/byobu/windows cp -ar byobu-select-profile ${RPM_BUILD_ROOT}/usr/bin @@ -54,8 +62,10 @@ cp -ar byobu-launcher-install ${RPM_BUILD_ROOT}/usr/share/byobu cp -ar byobu-launcher-uninstall ${RPM_BUILD_ROOT}/usr/share/byobu cp -ar motd+shell ${RPM_BUILD_ROOT}/usr/bin cp -ar byobu-launcher ${RPM_BUILD_ROOT}/usr/bin +cp -ar byobu-janitor ${RPM_BUILD_ROOT}/usr/bin cp -ar byobu-export ${RPM_BUILD_ROOT}/usr/bin cp -ar profiles/*_* ${RPM_BUILD_ROOT}/usr/share/byobu/profiles +cp -ar statusrc ${RPM_BUILD_ROOT}/etc/byobu %clean @@ -66,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) /usr/bin/motd+shell /usr/bin/byobu-launcher +/usr/bin/byobu-janitor /usr/bin/byobu /usr/bin/byobu-config /usr/bin/byobu-export @@ -102,7 +113,9 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/byobu/wifi_quality /usr/share/locale/es/LC_MESSAGES/byobu.mo /usr/share/locale/fr/LC_MESSAGES/byobu.mo +/usr/share/locale/ru/LC_MESSAGES/byobu.mo /usr/share/byobu/keybindings/common +/usr/share/byobu/keybindings/f-keys /usr/share/byobu/keybindings/none /usr/share/byobu/profiles/byoburc /usr/share/byobu/profiles/NONE @@ -125,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/byobu/byobu-launcher-install /usr/share/byobu/byobu-launcher-uninstall /usr/share/byobu/windows/common +/etc/byobu %doc README %doc doc/help.txt %doc debian/copyright From 4900123fb9c54daf6ab202845ae97999bff2c96b Mon Sep 17 00:00:00 2001 From: Derek Carter Date: Fri, 7 Aug 2009 19:00:09 -0400 Subject: [PATCH 2/3] fixed trigger for f-5 in common keybinding, and a trigger to re-load in byobu-config --- byobu-config | 2 ++ keybindings/common | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/byobu-config b/byobu-config index 1b98b2f7..6120098b 100755 --- a/byobu-config +++ b/byobu-config @@ -99,6 +99,8 @@ def menu(screen, size, isInstalled): g.add(bb, 0, 1, padding=(1,1,0,0)) if bb.buttonPressed(g.runOnce()) == "exit": + win='screen -X at 0 source $HOME/.byobu/profile' + commands.getoutput(win) return 0 else: return li.current() diff --git a/keybindings/common b/keybindings/common index c3f46252..34310b1d 100644 --- a/keybindings/common +++ b/keybindings/common @@ -35,7 +35,7 @@ register n "^a^c^aA" # | Goes with the F2 definition bindkey -k k2 process n # F2 | Create new window (and name it) bindkey -k k3 prev # F3 | Previous Window bindkey -k k4 next # F4 | Next Window -register r "^a:source $HOME/.screen-profiles/profile" # | Goes with F5 definition +register r "^a:source $HOME/.byobu/profile " # | 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 From 390371f5226a528f3276afe3d20d02f8f2532d5b Mon Sep 17 00:00:00 2001 From: Derek Carter Date: Fri, 7 Aug 2009 19:20:56 -0400 Subject: [PATCH 3/3] updated spec with my changes --- rpm/byobu.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpm/byobu.spec b/rpm/byobu.spec index 3b533873..3b455216 100644 --- a/rpm/byobu.spec +++ b/rpm/byobu.spec @@ -147,6 +147,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 7 2009 Derek Carter +- Updated specfile to build on Fedora11 +- Fixed some keybindings for Fedora11 +- Made an expermental trigger for sourcing config on exit of byobu-config + * Tue May 5 2009 David Duffey - Initial RPM release - see /usr/share/doc/byobu-*/changelog for upstream changelog