From f1f8844a33bb1d58b1dca367d571e6110045055c Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 8 Nov 2013 12:19:16 -0600 Subject: [PATCH] * etc/byobu/backend, usr/lib/byobu/include/common: - really default to tmux, at this point - tmux was the default in the previous LTS --- debian/changelog | 3 +++ etc/byobu/backend | 2 +- usr/lib/byobu/include/common | 17 +++++------------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5cd9b7b3..08529644 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ byobu (5.64) unreleased; urgency=low - adjust whitespace * usr/bin/byobu: - handle the backend better + * etc/byobu/backend, usr/lib/byobu/include/common: + - really default to tmux, at this point + - tmux was the default in the previous LTS -- Dustin Kirkland Thu, 07 Nov 2013 11:55:15 -0600 diff --git a/etc/byobu/backend b/etc/byobu/backend index cfe87102..d71e61c5 100644 --- a/etc/byobu/backend +++ b/etc/byobu/backend @@ -1,4 +1,4 @@ # BYOBU_BACKEND can currently be "screen" or "tmux" # Override this on a per-user basis by editing "$BYOBU_CONFIG_DIR/backend" # or by launching either "byobu-screen" or "byobu-tmux" instead of "byobu". -#BYOBU_BACKEND="tmux" +BYOBU_BACKEND="tmux" diff --git a/usr/lib/byobu/include/common b/usr/lib/byobu/include/common index bfb13f89..0cf325d4 100755 --- a/usr/lib/byobu/include/common +++ b/usr/lib/byobu/include/common @@ -33,18 +33,11 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then [ -r "$BYOBU_CONFIG_DIR/backend" ] && . "$BYOBU_CONFIG_DIR/backend" # Just in case there's no config file at all if [ -z "${BYOBU_BACKEND}" ]; then - if [ -d "$BYOBU_CONFIG_DIR" ] && [ -r "$BYOBU_CONFIG_DIR/profile" ]; then - # Previous byobu configuration exists, default to screen - for i in screen tmux; do - $BYOBU_TEST $i >/dev/null && BYOBU_BACKEND="$i" && break - done - unset i - else - # New byobu configuration, default to tmux - for i in tmux screen; do - $BYOBU_TEST $i >/dev/null && BYOBU_BACKEND="$i" && break - done - unset i + # New byobu configuration, default to tmux + for i in tmux screen; do + $BYOBU_TEST $i >/dev/null && BYOBU_BACKEND="$i" && break + done + unset i fi if ! $BYOBU_TEST "$BYOBU_BACKEND" >/dev/null; then printf "%s\n" "ERROR: $PKG won't work without tmux or screen installed" 1>&2