diff --git a/debian/changelog b/debian/changelog index b48b8f82..2d2d08ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ byobu (5.75) unreleased; urgency=medium - fix layout saving, which broke in tmux 1.8 - incrementally rearrange while building our windows up to restore, as sometimes we run out of room; tiling in between seems to work + * usr/bin/byobu-janitor.in, usr/lib/byobu/include/colors, + usr/lib/byobu/include/constants: + - fix profile color breakage [ Kosuke Asami ] * usr/lib/byobu/battery: LP: #1289157, #1289157 diff --git a/usr/bin/byobu-janitor.in b/usr/bin/byobu-janitor.in index 20ae685d..f4812759 100755 --- a/usr/bin/byobu-janitor.in +++ b/usr/bin/byobu-janitor.in @@ -67,7 +67,7 @@ MC=0 # Seed the configuration # Setup initial local user configuration [ -r "$BYOBU_CONFIG_DIR/color" ] || printf "BACKGROUND=k\nFOREGROUND=w\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color" -[ -r "$BYOBU_CONFIG_DIR/color.tmux" ] || sed -e "s/^#.*//" -e "/^\s*$/d" "$BYOBU_PREFIX/lib/$PKG/include/colors" > "$BYOBU_CONFIG_DIR/color.tmux" +[ -r "$BYOBU_CONFIG_DIR/color.tmux" ] || sed -e "s/^#.*//" -e "/^\s*$/d" -e "s/^export //" "$BYOBU_PREFIX/lib/$PKG/include/colors" > "$BYOBU_CONFIG_DIR/color.tmux" [ -r "$BYOBU_CONFIG_DIR/datetime.tmux" ] || printf 'BYOBU_DATE="%%Y-%%m-%%d "\nBYOBU_TIME="%%H:%%M:%%S"\n' > "$BYOBU_CONFIG_DIR/datetime.tmux" [ -r "$BYOBU_CONFIG_DIR/profile" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/common" > "$BYOBU_CONFIG_DIR/profile" [ -r "$BYOBU_CONFIG_DIR/profile.tmux" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/tmux" > "$BYOBU_CONFIG_DIR/profile.tmux" diff --git a/usr/lib/byobu/include/colors b/usr/lib/byobu/include/colors index 45f8934a..470fe4b1 100644 --- a/usr/lib/byobu/include/colors +++ b/usr/lib/byobu/include/colors @@ -20,10 +20,15 @@ # Default colors # Inspired by http://design.ubuntu.com/brand/colour-palette -export BYOBU_DARK="\#333333" # Cool grey -export BYOBU_LIGHT="\#EEEEEE" # Warm white -export BYOBU_ACCENT="\#75507B" # Aubergine -export BYOBU_HIGHLIGHT="\#DD4814" # Ubuntu orange -export BYOBU_WINDOW_NAME="-" -export BYOBU_DATE="%Y-%m-%d " -export BYOBU_TIME="%H:%M:%S" + +# Cool grey +export BYOBU_DARK="\#333333" + +# Warm white +export BYOBU_LIGHT="\#EEEEEE" + +# Aubergine +export BYOBU_ACCENT="\#75507B" + +# Ubuntu orange +export BYOBU_HIGHLIGHT="\#DD4814" diff --git a/usr/lib/byobu/include/constants b/usr/lib/byobu/include/constants index 42bc9b23..1c6fe96d 100755 --- a/usr/lib/byobu/include/constants +++ b/usr/lib/byobu/include/constants @@ -64,3 +64,7 @@ if [ -z "$BYOBU_PYTHON" ]; then export BYOBU_PYTHON="python" fi fi + +export BYOBU_WINDOW_NAME="-" +export BYOBU_DATE="%Y-%m-%d " +export BYOBU_TIME="%H:%M:%S"