diff --git a/bin/logo b/bin/logo index 5e248740..f455e68e 100755 --- a/bin/logo +++ b/bin/logo @@ -31,63 +31,63 @@ print_logo() { distro=`echo "$1" | sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ` case "$distro" in *ubuntu*) - $MARKUP && printf "$(color b k r)%s$(color k y)%s$(color b k Y)%s" "\\" "o" "/" || printf "\\o/" + $MARKUP && printf "$(color b k r)%s$(color -)$(color k y)%s$(color -)$(color b k Y)%s$(color -)" "\\" "o" "/" || printf "\\o/" ;; *altlinux*) logo="alt" - $MARKUP && printf "$(color Y k)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color Y k)%s$(color -)" "$logo" || printf "$logo" ;; *arch*) logo=" A " - $MARKUP && printf "$(color b w b)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color b w b)%s$(color -)" "$logo" || printf "$logo" ;; *centos*) logo="****" - $MARKUP && printf "$(color g w)*$(color m w)*$(color y w)*$(color b w)*" || printf "$logo" + $MARKUP && printf "$(color g w)*$(color -)$(color m w)*$(color -)$(color y w)*$(color -)$(color b w)*$(color -)" || printf "$logo" ;; *debian*) logo=" @ " - $MARKUP && printf "$(color w r)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color w r)%s$(color -)" "$logo" || printf "$logo" ;; *fedora*) logo=" f " - $MARKUP && printf "$(color b w)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color b w)%s$(color -)" "$logo" || printf "$logo" ;; *foresight*) logo="<@>" - $MARKUP && printf "$(color b W g)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color b W g)%s$(color -)" "$logo" || printf "$logo" ;; *gentoo*) logo=" > " - $MARKUP && printf "$(color b c w)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color b c w)%s$(color -)" "$logo" || printf "$logo" ;; *mandriva*) logo=" (* " - $MARKUP && printf "$(color b k c) ($(color b k y)* " || printf "$logo" + $MARKUP && printf "$(color b k c) ($(color -)$(color b k y)*$(color -) " || printf "$logo" ;; *redhat*) logo=" RH " - $MARKUP && printf "$(color R k)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color R k)%s$(color -)" "$logo" || printf "$logo" ;; *rockhopper*) logo="palm" - $MARKUP && printf "$(color k w)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color k w)%s$(color -)" "$logo" || printf "$logo" ;; *slackware*) logo=".S " - $MARKUP && printf "$(color u B k)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color u B k)%s$(color -)" "$logo" || printf "$logo" ;; *suse*) logo="SuSE" - $MARKUP && printf "$(color W g)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color W g)%s$(color -)" "$logo" || printf "$logo" ;; *xandros*) logo=" X " - $MARKUP && printf "$(color W r)%s" "$logo" || printf "$logo" + $MARKUP && printf "$(color W r)%s$(color -)" "$logo" || printf "$logo" ;; *) logo="[B]" - $MARKUP && printf "$(color b k W)%s" "$logo" || printf " $logo " + $MARKUP && printf "$(color b k W)%s$(color -)" "$logo" || printf " $logo " ;; esac } diff --git a/debian/changelog b/debian/changelog index 9cb5d53d..3dd97079 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ byobu (2.43-0ubuntu1) lucid; urgency=low * byobu-select-profile, byobu-config: improve color selection with more informative color names and support screen default background/foreground colors, LP: #500669 + * bin/logo, profiles/common: must undo each color change on logo printing + like all other status items, fix hardstatus line for "default color" -- Dustin Kirkland Wed, 23 Dec 2009 14:01:55 -0600 diff --git a/profiles/common b/profiles/common index 39ed6c2e..580b4333 100644 --- a/profiles/common +++ b/profiles/common @@ -97,7 +97,7 @@ source $HOME/.byobu/keybindings caption always "%12`%?%-Lw%50L>%?%{=r }%{+b }%n*%f %t%?(%u)%?%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<" # Status string, last line -hardstatus string '%99`%12` %100`%112`%= %130`%102`%101`%129`%127`%114`%115`%108`%128`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`' +hardstatus string '%99`%{-}%{=r}%12` %100`%112`%= %130`%102`%101`%129`%127`%114`%115`%108`%128`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`' # NOTE: Older version of screen have an arbitrary limit of only being able # to change colors 16 times in this 'hardstatus string'.