diff --git a/debian/changelog b/debian/changelog index ce8ffead..6649fdc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ byobu (5.62) unreleased; urgency=low * usr/share/byobu/keybindings/f-keys.tmux: - as it turns out, showing the current window name when renaming is really annoying + * usr/bin/byobu-janitor, usr/lib/byobu/menu, + usr/share/byobu/profiles/screenrc: LP: #1244509 + - customizations of screen configuration should go in + $BYOBU_CONFIG_DIR/.screenrc, which will be sourced last; rather than + ~/.screenrc (which should be reserved for screen-without-byobu) -- Dustin Kirkland Fri, 18 Oct 2013 16:29:56 -0500 diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor index 625a67e4..4228bef1 100755 --- a/usr/bin/byobu-janitor +++ b/usr/bin/byobu-janitor @@ -74,7 +74,7 @@ MC=0 [ -r "$BYOBU_CONFIG_DIR/keybindings.tmux" ] || touch "$BYOBU_CONFIG_DIR/keybindings.tmux" [ -r "$BYOBU_CONFIG_DIR/windows" ] || touch "$BYOBU_CONFIG_DIR/windows" [ -r "$BYOBU_CONFIG_DIR/backend" ] || echo "BYOBU_BACKEND=$BYOBU_BACKEND" > "$BYOBU_CONFIG_DIR/backend" -[ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc" +[ -r "$BYOBU_CONFIG_DIR/.screenrc" ] || touch "$BYOBU_CONFIG_DIR/.screenrc" [ -r "$BYOBU_CONFIG_DIR/.tmux.conf" ] || touch "$BYOBU_CONFIG_DIR/.tmux.conf" for f in status statusrc; do if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then diff --git a/usr/lib/byobu/menu b/usr/lib/byobu/menu index 09a2bb5e..dc5d5036 100755 --- a/usr/lib/byobu/menu +++ b/usr/lib/byobu/menu @@ -25,7 +25,7 @@ __menu_detail() { __menu() { local bindings esc key text - [ -r "$BYOBU_CONFIG_DIR/keybindings" ] && bindings="$BYOBU_CONFIG_DIR/keybindings" || bindings="$HOME/.screenrc" + [ -r "$BYOBU_CONFIG_DIR/keybindings" ] && bindings="$BYOBU_CONFIG_DIR/keybindings" || bindings="$BYOBU_CONFIG_DIR/.screenrc" if grep -qs "^source.*screen-escape-keys$" $bindings 2>/dev/null || grep -qs "^source.*f-keys.screen.disable$" $bindings 2>/dev/null || [ "$1" = "--disable-f-keys" ]; then # Get the second to last byte from the "escape" option esc=`grep "^escape" $bindings | tail -c 3 | head -c 1` diff --git a/usr/share/byobu/profiles/screenrc b/usr/share/byobu/profiles/screenrc index cf11d919..42ee4583 100644 --- a/usr/share/byobu/profiles/screenrc +++ b/usr/share/byobu/profiles/screenrc @@ -24,4 +24,4 @@ source $BYOBU_CONFIG_DIR/profile source $BYOBU_WINDOWS -source $HOME/.screenrc +source $BYOBU_CONFIG_DIR/.screenrc