diff --git a/debian/changelog b/debian/changelog index cae2e90e..5f3f30e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ byobu (4.51) unreleased; urgency=low - * UNRELEASED + * usr/bin/byobu-janitor: LP: #894430 + - whitelist archlinux for status colors + - if tmux exists, then don't bother with color disabling -- Dustin Kirkland Wed, 23 Nov 2011 13:41:31 -0600 diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor index e03866d4..5cbc8bbe 100755 --- a/usr/bin/byobu-janitor +++ b/usr/bin/byobu-janitor @@ -54,12 +54,16 @@ fi # NOTE: Older version of Screen have an arbitrary limit of only being able # to change colors 16 times in this 'hardstatus string'. -# Whitelist Debian and Ubuntu where the fix has been released. +# Whitelist distros where the fix has been released. # Also committed in Upstream git, but not yet released. # * http://savannah.gnu.org/bugs/?22146 MC=1 if command -v egrep >/dev/null; then - egrep -qsi "ubuntu|debian" /etc/issue 2>/dev/null && MC=0 || true + if ! command -v tmux >/dev/null; then + if egrep -qsi "ubuntu|debian" /etc/issue 2>/dev/null || [ -e "/etc/arch-release" ]; then + MC=0 + fi + fi fi # Affects: First runs with no configuration