--colors use color 7 instead of foreground. Adds 'fg' as new value for colors

This commit is contained in:
Dylan 2016-04-24 11:10:57 +10:00
parent 3abf47908d
commit ce3567b2f6
2 changed files with 7 additions and 3 deletions

View File

@ -211,6 +211,8 @@ block_width=3
# the text in this order: # the text in this order:
# title, @, underline, subtitle, colon, info # title, @, underline, subtitle, colon, info
# colors=(4 6 1 8 8 6) # colors=(4 6 1 8 8 6)
# You can also specify:
# fg (foreground color)
colors=(distro) colors=(distro)

View File

@ -236,6 +236,8 @@ block_width=3
# the text in this order: # the text in this order:
# title, @, underline, subtitle, colon, info # title, @, underline, subtitle, colon, info
# colors=(4 6 1 8 8 6) # colors=(4 6 1 8 8 6)
# You can also specify:
# fg (foreground color)
colors=(distro) colors=(distro)
@ -2420,7 +2422,7 @@ setcolors () {
fi fi
if [ "$progress_color_elapsed" == "distro" ]; then if [ "$progress_color_elapsed" == "distro" ]; then
progress_color_elapsed="$(color 7)" progress_color_elapsed="$(color fg)"
else else
progress_color_elapsed="$(color $progress_color_elapsed)" progress_color_elapsed="$(color $progress_color_elapsed)"
fi fi
@ -2434,8 +2436,8 @@ setcolors () {
color () { color () {
case "$1" in case "$1" in
[0-6]) printf "%b%s" "\033[0m\033[3${1}m" ;; [0-7]) printf "%b%s" "\033[0m\033[3${1}m" ;;
7) printf "%b%s" "\033[0m" ;; "fg") printf "%b%s" "\033[0m" ;;
*) printf "%b%s" "\033[38;5;${1}m" ;; *) printf "%b%s" "\033[38;5;${1}m" ;;
esac esac
} }