github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 06:23:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/include/shutil: LP: #1059232

Browse source 
- fix tmux color clearing
This commit is contained in:
Dustin Kirkland 2012-11-04 17:42:58 +01:00
commit 85d94e3128
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -27,6 +27,8 @@ byobu (5.22) unreleased; urgency=low
* usr/share/man/man1/byobu.1: LP: #1059237 * usr/share/man/man1/byobu.1: LP: #1059237
- document that you can copy status scripts to ~/.byobu/bin and - document that you can copy status scripts to ~/.byobu/bin and
modify them locally modify them locally
* usr/lib/byobu/include/shutil: LP: #1059232
- fix tmux color clearing
[ Jake Biesinger and Dustin Kirkland ] [ Jake Biesinger and Dustin Kirkland ]
* usr/share/byobu/keybindings/common, usr/share/byobu/keybindings/f- * usr/share/byobu/keybindings/common, usr/share/byobu/keybindings/f-

16
usr/lib/byobu/include/shutil
View file

@ -91,12 +91,12 @@ color_tmux() {
local back fore attr local back fore attr
case "$1" in case "$1" in
"") return 0 ;; "") return 0 ;;
-) printf "#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK]" ;; -) printf "#[default]#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK]" ;;
--) printf "#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK] " ;; --) printf "#[default]#[fg=$BYOBU_LIGHT]#[bg=$BYOBU_DARK] " ;;
esc) printf "" ;; esc) printf "" ;;
bold*) printf "#[fg=bold]" ;; bold*) printf "#[default]#[fg=bold]" ;;
none) printf "#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK]" ;; none) printf "#[default]#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK]" ;;
invert) printf "#[reverse]" ;; invert) printf "#[default]#[reverse]" ;;
*) *)
if [ "$#" = "2" ]; then if [ "$#" = "2" ]; then
color_map "$1"; back="$_RET" color_map "$1"; back="$_RET"
@ -106,7 +106,7 @@ color_tmux() {
color_map "$2"; back="$_RET" color_map "$2"; back="$_RET"
color_map "$3"; fore="$_RET" color_map "$3"; fore="$_RET"
fi fi
[ "$MONOCHROME" = "1" ] && printf "#[default]" || printf "#[fg=$fore$attr,bg=$back]" [ "$MONOCHROME" = "1" ] && printf "#[default]" || printf "#[default]#[fg=$fore$attr,bg=$back]"
;; ;;
esac esac
} }
@ -209,7 +209,7 @@ metadata_available() {
# This is really ugly. We need a reliable, fast way of determining # This is really ugly. We need a reliable, fast way of determining
# if a metadata service is available, that does NOT slow down non-ec2 # if a metadata service is available, that does NOT slow down non-ec2
# machines. # machines.
local x=0 cache="$BYOBU_RUN_DIR/.metadata_available" local x=0 cache="$BYOBU_CONFIG_DIR/.metadata_available"
# First, check the cache # First, check the cache
if [ -s "$cache" ]; then if [ -s "$cache" ]; then
# Metadata is non-empty, so we have metadata available # Metadata is non-empty, so we have metadata available
@ -218,7 +218,7 @@ metadata_available() {
# Must seed the cache # Must seed the cache
if [ -e /etc/ec2_version ] || [ -e /usr/sbin/update-grub-legacy-ec2 ]; then if [ -e /etc/ec2_version ] || [ -e /usr/sbin/update-grub-legacy-ec2 ]; then
# This *looks* like a machine with metadata, so background a potentially slow check # This *looks* like a machine with metadata, so background a potentially slow check
wget -q -O "$cache" --timeout=5 --tries=1 http://169.254.169.254 2>/dev/null & wget -q -O "$cache" --timeout=10 --tries=1 http://169.254.169.254 2>/dev/null &
sleep 0.02 sleep 0.02
[ -s "$cache" ] && x=1 [ -s "$cache" ] && x=1
fi fi