* etc/byobu/backend, usr/lib/byobu/.constants:

- add support for storing byobu backend configuration (screen|tmux)
* debian/control: start suggesting tmux
This commit is contained in:
Dustin Kirkland 2011-06-30 09:16:41 +00:00
commit 85a5d32eb9
4 changed files with 14 additions and 2 deletions

3
debian/changelog vendored
View file

@ -20,6 +20,9 @@ byobu (4.18) unreleased; urgency=low
* === removed directory usr/sbin, usr/sbin/byobu-classroom => * === removed directory usr/sbin, usr/sbin/byobu-classroom =>
experimental/byobu-classroom: experimental/byobu-classroom:
- move the classroom to experimental (about to be an ensemble formula) - move the classroom to experimental (about to be an ensemble formula)
* etc/byobu/backend, usr/lib/byobu/.constants:
- add support for storing byobu backend configuration (screen|tmux)
* debian/control: start suggesting tmux
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 29 Jun 2011 02:26:28 +0000 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 29 Jun 2011 02:26:28 +0000

2
debian/control vendored
View file

@ -10,7 +10,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/byobu/trunk
Package: byobu Package: byobu
Architecture: all Architecture: all
Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11) Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11)
Suggests: apport, vim, w3m, po-debconf, update-notifier-common, lsb-release Suggests: apport, vim, w3m, po-debconf, update-notifier-common, lsb-release, tmux
Provides: screen-profiles, screen-profiles-extras, byobu-extras Provides: screen-profiles, screen-profiles-extras, byobu-extras
Replaces: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0), byobu-extras (<< 2.17) Replaces: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0), byobu-extras (<< 2.17)
Breaks: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0), byobu-extras (<< 2.17) Breaks: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0), byobu-extras (<< 2.17)

2
etc/byobu/backend Normal file
View file

@ -0,0 +1,2 @@
# BYOBU_BACKEND can currently be "screen" or "tmux"
BYOBU_BACKEND="screen"

View file

@ -21,7 +21,14 @@
PKG="byobu" PKG="byobu"
# Support two different backends (screen/tmux) # Support two different backends (screen/tmux)
[ -z "$BYOBU_BACKEND" ] && export BYOBU_BACKEND="screen" || export BYOBU_BACKEND if [ -z "$BYOBU_BACKEND" ];
[ -r "/etc/byobu/backend" ] && . "/etc/byobu/backend"
[ -r "$BYOBU_CONFIG_DIR/backend" ] && . "$BYOBU_CONFIG_DIR/backend"
fi
case "$BYOBU_BACKEND" in
screen|tmux) export BYOBU_BACKEND ;;
*) export BYOBU_BACKEND="screen" ;;
esac
# Create and set the user configuration directory # Create and set the user configuration directory
if [ -d "$XDG_CONFIG_HOME" ] && mkdir -p "$XDG_CONFIG_HOME/$PKG"; then if [ -d "$XDG_CONFIG_HOME" ] && mkdir -p "$XDG_CONFIG_HOME/$PKG"; then