From c958a57c1c928125cd93b801c8f602b88e66ac4e Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 29 Jun 2011 00:54:05 +0000 Subject: [PATCH] * etc/byobu/statusrc, usr/share/byobu/keybindings/f-keys, usr/share/byobu/keybindings/screen-escape-keys, usr/share/byobu/profiles/byoburc, usr/share/byobu/profiles/common, usr/share/byobu/profiles/screenrc, usr/share/man/man1/byobu.1: - fix up a few more references to BYOBU_CONFIG_DIR --- debian/changelog | 5 +++++ etc/byobu/statusrc | 2 +- usr/share/byobu/keybindings/f-keys | 2 +- usr/share/byobu/keybindings/screen-escape-keys | 2 +- usr/share/byobu/profiles/byoburc | 4 ++-- usr/share/byobu/profiles/common | 4 ++-- usr/share/byobu/profiles/screenrc | 2 +- usr/share/man/man1/byobu.1 | 2 +- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 388fb32b..9b017700 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,11 @@ byobu (4.17) unreleased; urgency=low - should probably export those * usr/bin/byobu-ctrl-a: - whitespace + * etc/byobu/statusrc, usr/share/byobu/keybindings/f-keys, + usr/share/byobu/keybindings/screen-escape-keys, + usr/share/byobu/profiles/byoburc, usr/share/byobu/profiles/common, + usr/share/byobu/profiles/screenrc, usr/share/man/man1/byobu.1: + - fix up a few more references to BYOBU_CONFIG_DIR -- Dustin Kirkland Mon, 27 Jun 2011 14:14:17 +0000 diff --git a/etc/byobu/statusrc b/etc/byobu/statusrc index 8c64bf60..994f521d 100644 --- a/etc/byobu/statusrc +++ b/etc/byobu/statusrc @@ -1,6 +1,6 @@ # statusrc # Byobu's default status notifications -# Override these in $HOME/.byobu/status +# Override these in $BYOBU_CONFIG_DIR/status # # Copyright (C) 2009 Canonical Ltd. # diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys index 9b3b3b18..af466d28 100644 --- a/usr/share/byobu/keybindings/f-keys +++ b/usr/share/byobu/keybindings/f-keys @@ -30,7 +30,7 @@ bindkey -k k1 screen -t config 0 byobu-config # F1 | Configuration (along with bindkey -k k2 screen # F2 | Create new window bindkey -k k3 eval 'prev' 'fit' # F3 | Previous Window bindkey -k k4 eval 'next' 'fit' # F4 | Next Window -register r ":source $HOME/.byobu/profile^M" # | Goes with F5 definition +register r ":source $BYOBU_CONFIG_DIR/profile^M" # | Goes with F5 definition bindkey -k k5 eval 'process x' 'process r' # F5 | Reload profile bindkey -k k6 detach # F6 | Detach from this session bindkey -k k7 copy # F7 | Enter copy/scrollback mode diff --git a/usr/share/byobu/keybindings/screen-escape-keys b/usr/share/byobu/keybindings/screen-escape-keys index 09f43b31..b374a685 100644 --- a/usr/share/byobu/keybindings/screen-escape-keys +++ b/usr/share/byobu/keybindings/screen-escape-keys @@ -49,7 +49,7 @@ bindkey "^[[17;2~" # ctrl-a-p Previous window F3 # ctrl-a-n Next window F4 # ctrl-a-R Reload profile F5 -register r ":source $HOME/.byobu/profile^M" +register r ":source $BYOBU_CONFIG_DIR/profile^M" bind R eval 'process x' 'process r' # ctrl-a-d Detach from this session F6 # ctrl-a-[ Enter copy/scrollback mode F7 diff --git a/usr/share/byobu/profiles/byoburc b/usr/share/byobu/profiles/byoburc index a9d44cd7..dc4a14f1 100644 --- a/usr/share/byobu/profiles/byoburc +++ b/usr/share/byobu/profiles/byoburc @@ -2,7 +2,7 @@ # Load: # * the stock byobu profile # * any windows -# * and the local .byoburc (instead of .screenrc) +# * and the local byoburc (instead of .screenrc) # Used at startup but not profile refresh # # Copyright (C) 2009-2011 Canonical Ltd. @@ -22,6 +22,6 @@ # along with this program. If not, see . ############################################################################### -source $HOME/.byobu/profile +source $BYOBU_CONFIG_DIR/profile source $BYOBU_WINDOWS source $HOME/.byoburc diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common index 68087a21..24a24464 100644 --- a/usr/share/byobu/profiles/common +++ b/usr/share/byobu/profiles/common @@ -108,7 +108,7 @@ activity "" fit # Maintain SSH_AUTH_SOCK link -setenv SSH_AUTH_SOCK $HOME/.byobu/.ssh-agent +setenv SSH_AUTH_SOCK $BYOBU_CONFIG_DIR/.ssh-agent # Window tabs, second to last line caption always "%12`%?%-Lw%50L>%?%{=r}%n*%f %t%?(%u)%?%{-}%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<" @@ -123,4 +123,4 @@ hardstatus string '%99`%{-}%{=r}%12` %100`%112`%=%117`%133`%130`%135`%102`%101`% # Upstream: # * http://savannah.gnu.org/bugs/?22146 -source $HOME/.byobu/keybindings +source $BYOBU_CONFIG_DIR/keybindings diff --git a/usr/share/byobu/profiles/screenrc b/usr/share/byobu/profiles/screenrc index 2ae2400b..0dc73361 100644 --- a/usr/share/byobu/profiles/screenrc +++ b/usr/share/byobu/profiles/screenrc @@ -22,6 +22,6 @@ # along with this program. If not, see . ############################################################################### -source $HOME/.byobu/profile +source $BYOBU_CONFIG_DIR/profile source $BYOBU_WINDOWS source $HOME/.screenrc diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1 index a3fa8c52..d545cc05 100644 --- a/usr/share/man/man1/byobu.1 +++ b/usr/share/man/man1/byobu.1 @@ -176,7 +176,7 @@ byobu keybindings can be user defined in /usr/share/byobu/keybindings/ (or withi .SH "BUGS" -For Byobu colors to work properly, older versions of GNU Screen require a 1-line patch to adjust MAX_WINMSG_REND in screen.c. The change is in GNU Screen's upstream source control system as of 2010-01-26, but GNU Screen has not released a new upstream version in several years. You can disable colors entirely by setting MONOCHROME=1 in \fI~/.byobu/statusrc\fP. For more information, see: +For Byobu colors to work properly, older versions of GNU Screen require a 1-line patch to adjust MAX_WINMSG_REND in screen.c. The change is in GNU Screen's upstream source control system as of 2010-01-26, but GNU Screen has not released a new upstream version in several years. You can disable colors entirely by setting MONOCHROME=1 in \fI$BYOBU_CONFIG_DIR/statusrc\fP. For more information, see: * http://savannah.gnu.org/bugs/?22146 PuTTY users have reported that the F2, F3, and F4 shortcut keys are not working properly. PuTTY sends the same escape sequences as the linux console for F1-F4 by default. You can fix this problem in the PuTTY config, Terminal -> Keyboard -> Function keys: Xterm R6. See: \fIhttp://www.mail-archive.com/screen-users@gnu.org/msg01525.html\fP