Clear highlighting before setting colors

This commit is contained in:
Dylan 2016-03-29 18:28:26 +11:00
parent 3ea3451417
commit 9b58b7cdb7

View file

@ -2311,30 +2311,30 @@ colors () {
} }
setcolors () { setcolors () {
c1="\033[3${1}m" c1="\033[0m\033[3${1}m"
c2="\033[3${2}m" c2="\033[0m\033[3${2}m"
c3="\033[3${3}m" c3="\033[0m\033[3${3}m"
c4="\033[3${4}m" c4="\033[0m\033[3${4}m"
c5="\033[3${5}m" c5="\033[0m\033[3${5}m"
c6="\033[3${6}m" c6="\033[0m\033[3${6}m"
if [ "${colors[0]}" == "distro" ]; then if [ "${colors[0]}" == "distro" ]; then
title_color="\033[3${1}m" title_color="\033[0m\033[3${1}m"
at_color="\033[0m" at_color="\033[0m\033[0m"
underline_color="\033[0m" underline_color="\033[0m\033[0m"
subtitle_color="\033[3${2}m" subtitle_color="\033[0m\033[3${2}m"
colon_color="\033[0m" colon_color="\033[0m\033[0m"
info_color="\033[0m" info_color="\033[0m\033[0m"
# If the second color is white use the first for the subtitle # If the second color is white use the first for the subtitle
[ "$2" == 7 ] && subtitle_color="\033[3${1}m" [ "$2" == 7 ] && subtitle_color="\033[0m\033[3${1}m"
else else
title_color="\033[3${colors[0]}m" title_color="\033[0m\033[3${colors[0]}m"
at_color="\033[3${colors[1]}m" at_color="\033[0m\033[3${colors[1]}m"
underline_color="\033[3${colors[2]}m" underline_color="\033[0m\033[3${colors[2]}m"
subtitle_color="\033[3${colors[3]}m" subtitle_color="\033[0m\033[3${colors[3]}m"
colon_color="\033[3${colors[4]}m" colon_color="\033[0m\033[3${colors[4]}m"
info_color="\033[3${colors[5]}m" info_color="\033[0m\033[3${colors[5]}m"
fi fi
[ "$progress_color_elapsed" == "distro" ] && \ [ "$progress_color_elapsed" == "distro" ] && \
@ -2349,7 +2349,7 @@ setcolors () {
} }
color () { color () {
printf "%b%s" "\033[3${1}m" printf "%b%s" "\033[0m\033[3${1}m"
} }