lib/utils, themes: Deprecate color variables

This commit is contained in:
Koichi Murase
2022-01-17 01:46:10 +09:00
parent 7c7e276a6e
commit ee9eb7659e
3 changed files with 206 additions and 101 deletions

View File

@@ -256,10 +256,26 @@ is_alias() {
[[ -f $base_dir/aliases/$name/$name.aliases.sh ]]
}
# lib/utils.sh -- Logging functions
_omb_deprecate_function 20000 type_exists _omb_util_binary_exists
_omb_deprecate_const 20000 ncolors "$_omb_term_colors" "Please use '_omb_term_colors'."
_omb_deprecate_const 20000 bold "$_omb_term_bold" "Please use '_omb_term_bold'."
_omb_deprecate_const 20000 underline "$_omb_term_underline" "Please use '_omb_term_underline'."
_omb_deprecate_const 20000 reset "$_omb_term_reset" "Please use '_omb_term_reset'."
_omb_deprecate_const 20000 tan "$_omb_term_yellow" "Please use '_omb_term_yellow'."
_omb_prompt_red=${_omb_term_red:+$'\1'$_omb_term_red$'\2'}
_omb_prompt_green=${_omb_term_green:+$'\1'$_omb_term_green$'\2'}
_omb_prompt_yellow=${_omb_term_yellow:+$'\1'$_omb_term_yellow$'\2'}
_omb_prompt_blue=${_omb_term_blue:+$'\1'$_omb_term_blue$'\2'}
_omb_prompt_magenta=${_omb_term_magenta:+$'\1'$_omb_term_magenta$'\2'}
_omb_deprecate_const 20000 red "$_omb_prompt_red" "Please use '_omb_term_red' or '_omb_prompt_red'."
_omb_deprecate_const 20000 green "$_omb_prompt_green" "Please use '_omb_term_green' or '_omb_prompt_green'."
_omb_deprecate_const 20000 yellow "$_omb_prompt_yellow" "Please use '_omb_term_yellow' or '_omb_prompt_yellow'."
_omb_deprecate_const 20000 blue "$_omb_prompt_blue" "Please use '_omb_term_blue' or '_omb_prompt_blue'."
_omb_deprecate_const 20000 purple "$_omb_prompt_magenta" "Please use '_omb_term_magenta' or '_omb_prompt_magenta'."
_omb_deprecate_function 20000 e_header _omb_log_header
_omb_deprecate_function 20000 e_arrow _omb_log_arrow
_omb_deprecate_function 20000 e_success _omb_log_success

View File

@@ -126,29 +126,35 @@ _omb_util_function_exists() {
#
# Use colors, but only if connected to a terminal, and that terminal
# supports them.
if which tput >/dev/null 2>&1; then
ncolors=$(tput colors)
fi
if [[ -t 1 && $ncolors && ncolors -ge 8 ]]; then
bold=$(tput bold 2>/dev/null || tput md 2>/dev/null)
underline=$(tput smul 2>/dev/null || tput ul 2>/dev/null)
reset=$(tput sgr0 2>/dev/null || tput me 2>/dev/null)
red=$(tput setaf 1 2>/dev/null || tput AF 1 2>/dev/null)
green=$(tput setaf 2 2>/dev/null || tput AF 2 2>/dev/null)
yellow=$(tput setaf 3 2>/dev/null || tput AF 3 2>/dev/null)
blue=$(tput setaf 4 2>/dev/null || tput AF 4 2>/dev/null)
purple=$(tput setaf 171 2>/dev/null || tput AF 171 2>/dev/null)
tan=$(tput setaf 3 2>/dev/null || tput AF 3 2>/dev/null)
else
bold=""
underline=""
reset=""
red=""
green=""
yellow=""
blue=""
purple=""
tan=""
_omb_term_colors=
_omb_term_bold=
_omb_term_underline=
_omb_term_reset=
_omb_term_black=
_omb_term_red=
_omb_term_green=
_omb_term_yellow=
_omb_term_blue=
_omb_term_magenta=
_omb_term_cyan=
_omb_term_white=
_omb_term_purple=
if _omb_util_binary_exists tput; then
_omb_term_colors=$(tput colors 2>/dev/null || tput Co 2>/dev/null)
if [[ -t 1 && $_omb_term_colors && _omb_term_colors -ge 8 ]]; then
_omb_term_bold=$(tput bold 2>/dev/null || tput md 2>/dev/null)
_omb_term_underline=$(tput smul 2>/dev/null || tput ul 2>/dev/null)
_omb_term_reset=$(tput sgr0 2>/dev/null || tput me 2>/dev/null)
_omb_term_black=$(tput setaf 0 2>/dev/null || tput AF 0 2>/dev/null)
_omb_term_red=$(tput setaf 1 2>/dev/null || tput AF 1 2>/dev/null)
_omb_term_green=$(tput setaf 2 2>/dev/null || tput AF 2 2>/dev/null)
_omb_term_yellow=$(tput setaf 3 2>/dev/null || tput AF 3 2>/dev/null)
_omb_term_blue=$(tput setaf 4 2>/dev/null || tput AF 4 2>/dev/null)
_omb_term_magenta=$(tput setaf 5 2>/dev/null || tput AF 5 2>/dev/null)
_omb_term_cyan=$(tput setaf 6 2>/dev/null || tput AF 6 2>/dev/null)
_omb_term_white=$(tput setaf 7 2>/dev/null || tput AF 7 2>/dev/null)
_omb_term_purple=$(tput setaf 171 2>/dev/null || tput AF 171 2>/dev/null)
fi
fi
#

View File

@@ -181,91 +181,174 @@ function echo_color {
echo "$(__color_parse make_echo $@)"
}
# already defined in lib/omb-deprecated.sh
# @var _omb_prompt_red
# @var _omb_prompt_green
# @var _omb_prompt_yellow
# @var _omb_prompt_blue
# @var _omb_prompt_magenta
_omb_prompt_black='\[\e[0;30m\]'
_omb_prompt_cyan='\[\e[0;36m\]'
_omb_prompt_white='\[\e[0;37m\]'
_omb_prompt_orange='\[\e[0;91m\]'
black="\[\e[0;30m\]"
red="\[\e[0;31m\]"
green="\[\e[0;32m\]"
yellow="\[\e[0;33m\]"
blue="\[\e[0;34m\]"
purple="\[\e[0;35m\]"
cyan="\[\e[0;36m\]"
white="\[\e[0;37m\]"
orange="\[\e[0;91m\]"
_omb_prompt_bold_black='\[\e[30;1m\]'
_omb_prompt_bold_red='\[\e[31;1m\]'
_omb_prompt_bold_green='\[\e[32;1m\]'
_omb_prompt_bold_yellow='\[\e[33;1m\]'
_omb_prompt_bold_blue='\[\e[34;1m\]'
_omb_prompt_bold_magenta='\[\e[35;1m\]'
_omb_prompt_bold_cyan='\[\e[36;1m\]'
_omb_prompt_bold_white='\[\e[37;1m\]'
_omb_prompt_bold_orange='\[\e[91;1m\]'
bold_black="\[\e[30;1m\]"
bold_red="\[\e[31;1m\]"
bold_green="\[\e[32;1m\]"
bold_yellow="\[\e[33;1m\]"
bold_blue="\[\e[34;1m\]"
bold_purple="\[\e[35;1m\]"
bold_cyan="\[\e[36;1m\]"
bold_white="\[\e[37;1m\]"
bold_orange="\[\e[91;1m\]"
_omb_prompt_underline_black='\[\e[30;4m\]'
_omb_prompt_underline_red='\[\e[31;4m\]'
_omb_prompt_underline_green='\[\e[32;4m\]'
_omb_prompt_underline_yellow='\[\e[33;4m\]'
_omb_prompt_underline_blue='\[\e[34;4m\]'
_omb_prompt_underline_magenta='\[\e[35;4m\]'
_omb_prompt_underline_cyan='\[\e[36;4m\]'
_omb_prompt_underline_white='\[\e[37;4m\]'
_omb_prompt_underline_orange='\[\e[91;4m\]'
underline_black="\[\e[30;4m\]"
underline_red="\[\e[31;4m\]"
underline_green="\[\e[32;4m\]"
underline_yellow="\[\e[33;4m\]"
underline_blue="\[\e[34;4m\]"
underline_purple="\[\e[35;4m\]"
underline_cyan="\[\e[36;4m\]"
underline_white="\[\e[37;4m\]"
underline_orange="\[\e[91;4m\]"
_omb_prompt_background_black='\[\e[40m\]'
_omb_prompt_background_red='\[\e[41m\]'
_omb_prompt_background_green='\[\e[42m\]'
_omb_prompt_background_yellow='\[\e[43m\]'
_omb_prompt_background_blue='\[\e[44m\]'
_omb_prompt_background_magenta='\[\e[45m\]'
_omb_prompt_background_cyan='\[\e[46m\]'
_omb_prompt_background_white='\[\e[47;1m\]'
_omb_prompt_background_orange='\[\e[101m\]'
background_black="\[\e[40m\]"
background_red="\[\e[41m\]"
background_green="\[\e[42m\]"
background_yellow="\[\e[43m\]"
background_blue="\[\e[44m\]"
background_purple="\[\e[45m\]"
background_cyan="\[\e[46m\]"
background_white="\[\e[47;1m\]"
background_orange="\[\e[101m\]"
normal="\[\e[0m\]"
reset_color="\[\e[39m\]"
_omb_prompt_normal='\[\e[0m\]'
_omb_prompt_reset_color='\[\e[39m\]'
# These colors are meant to be used with `echo -e`
echo_black="\033[0;30m"
echo_red="\033[0;31m"
echo_green="\033[0;32m"
echo_yellow="\033[0;33m"
echo_blue="\033[0;34m"
echo_purple="\033[0;35m"
echo_cyan="\033[0;36m"
echo_white="\033[0;37;1m"
echo_orange="\033[0;91m"
echo_bold_black="\033[30;1m"
echo_bold_red="\033[31;1m"
echo_bold_green="\033[32;1m"
echo_bold_yellow="\033[33;1m"
echo_bold_blue="\033[34;1m"
echo_bold_purple="\033[35;1m"
echo_bold_cyan="\033[36;1m"
echo_bold_white="\033[37;1m"
echo_bold_orange="\033[91;1m"
# These variables are defined in lib/utils.sh
#
# _omb_term_black=$'\e[0;30m'
# _omb_term_red=$'\e[0;31m'
# _omb_term_green=$'\e[0;32m'
# _omb_term_yellow=$'\e[0;33m'
# _omb_term_blue=$'\e[0;34m'
# _omb_term_magenta=$'\e[0;35m'
# _omb_term_cyan=$'\e[0;36m'
# _omb_term_white=$'\e[0;37;1m'
# _omb_term_orange=$'\e[0;91m'
echo_underline_black="\033[30;4m"
echo_underline_red="\033[31;4m"
echo_underline_green="\033[32;4m"
echo_underline_yellow="\033[33;4m"
echo_underline_blue="\033[34;4m"
echo_underline_purple="\033[35;4m"
echo_underline_cyan="\033[36;4m"
echo_underline_white="\033[37;4m"
echo_underline_orange="\033[91;4m"
_omb_term_bold_black=$'\e[30;1m'
_omb_term_bold_red=$'\e[31;1m'
_omb_term_bold_green=$'\e[32;1m'
_omb_term_bold_yellow=$'\e[33;1m'
_omb_term_bold_blue=$'\e[34;1m'
_omb_term_bold_magenta=$'\e[35;1m'
_omb_term_bold_cyan=$'\e[36;1m'
_omb_term_bold_white=$'\e[37;1m'
_omb_term_bold_orange=$'\e[91;1m'
echo_background_black="\033[40m"
echo_background_red="\033[41m"
echo_background_green="\033[42m"
echo_background_yellow="\033[43m"
echo_background_blue="\033[44m"
echo_background_purple="\033[45m"
echo_background_cyan="\033[46m"
echo_background_white="\033[47;1m"
echo_background_orange="\033[101m"
_omb_term_underline_black=$'\e[30;4m'
_omb_term_underline_red=$'\e[31;4m'
_omb_term_underline_green=$'\e[32;4m'
_omb_term_underline_yellow=$'\e[33;4m'
_omb_term_underline_blue=$'\e[34;4m'
_omb_term_underline_magenta=$'\e[35;4m'
_omb_term_underline_cyan=$'\e[36;4m'
_omb_term_underline_white=$'\e[37;4m'
_omb_term_underline_orange=$'\e[91;4m'
echo_normal="\033[0m"
echo_reset_color="\033[39m"
_omb_term_background_black=$'\e[40m'
_omb_term_background_red=$'\e[41m'
_omb_term_background_green=$'\e[42m'
_omb_term_background_yellow=$'\e[43m'
_omb_term_background_blue=$'\e[44m'
_omb_term_background_magenta=$'\e[45m'
_omb_term_background_cyan=$'\e[46m'
_omb_term_background_white=$'\e[47;1m'
_omb_term_background_orange=$'\e[101m'
_omb_term_normal=$'\e[0m'
_omb_term_reset_color=$'\e[39m'
_omb_deprecate_const 20000 black "$_omb_prompt_black" "Please use '_omb_prompt_black'."
_omb_deprecate_const 20000 cyan "$_omb_prompt_cyan" "Please use '_omb_prompt_cyan'."
_omb_deprecate_const 20000 white "$_omb_prompt_white" "Please use '_omb_prompt_white'."
_omb_deprecate_const 20000 orange "$_omb_prompt_orange" "Please use '_omb_prompt_orange'."
_omb_deprecate_const 20000 bold_black "$_omb_prompt_bold_black" "Please use '_omb_prompt_bold_black'."
_omb_deprecate_const 20000 bold_red "$_omb_prompt_bold_red" "Please use '_omb_prompt_bold_red'."
_omb_deprecate_const 20000 bold_green "$_omb_prompt_bold_green" "Please use '_omb_prompt_bold_green'."
_omb_deprecate_const 20000 bold_yellow "$_omb_prompt_bold_yellow" "Please use '_omb_prompt_bold_yellow'."
_omb_deprecate_const 20000 bold_blue "$_omb_prompt_bold_blue" "Please use '_omb_prompt_bold_blue'."
_omb_deprecate_const 20000 bold_purple "$_omb_prompt_bold_magenta" "Please use '_omb_prompt_bold_magenta'."
_omb_deprecate_const 20000 bold_cyan "$_omb_prompt_bold_cyan" "Please use '_omb_prompt_bold_cyan'."
_omb_deprecate_const 20000 bold_white "$_omb_prompt_bold_white" "Please use '_omb_prompt_bold_white'."
_omb_deprecate_const 20000 bold_orange "$_omb_prompt_bold_orange" "Please use '_omb_prompt_bold_orange'."
_omb_deprecate_const 20000 underline_black "$_omb_prompt_underline_black" "Please use '_omb_prompt_underline_black'."
_omb_deprecate_const 20000 underline_red "$_omb_prompt_underline_red" "Please use '_omb_prompt_underline_red'."
_omb_deprecate_const 20000 underline_green "$_omb_prompt_underline_green" "Please use '_omb_prompt_underline_green'."
_omb_deprecate_const 20000 underline_yellow "$_omb_prompt_underline_yellow" "Please use '_omb_prompt_underline_yellow'."
_omb_deprecate_const 20000 underline_blue "$_omb_prompt_underline_blue" "Please use '_omb_prompt_underline_blue'."
_omb_deprecate_const 20000 underline_purple "$_omb_prompt_underline_magenta" "Please use '_omb_prompt_underline_magenta'."
_omb_deprecate_const 20000 underline_cyan "$_omb_prompt_underline_cyan" "Please use '_omb_prompt_underline_cyan'."
_omb_deprecate_const 20000 underline_white "$_omb_prompt_underline_white" "Please use '_omb_prompt_underline_white'."
_omb_deprecate_const 20000 underline_orange "$_omb_prompt_underline_orange" "Please use '_omb_prompt_underline_orange'."
_omb_deprecate_const 20000 background_black "$_omb_prompt_background_black" "Please use '_omb_prompt_background_black'."
_omb_deprecate_const 20000 background_red "$_omb_prompt_background_red" "Please use '_omb_prompt_background_red'."
_omb_deprecate_const 20000 background_green "$_omb_prompt_background_green" "Please use '_omb_prompt_background_green'."
_omb_deprecate_const 20000 background_yellow "$_omb_prompt_background_yellow" "Please use '_omb_prompt_background_yellow'."
_omb_deprecate_const 20000 background_blue "$_omb_prompt_background_blue" "Please use '_omb_prompt_background_blue'."
_omb_deprecate_const 20000 background_purple "$_omb_prompt_background_magenta" "Please use '_omb_prompt_background_magenta'."
_omb_deprecate_const 20000 background_cyan "$_omb_prompt_background_cyan" "Please use '_omb_prompt_background_cyan'."
_omb_deprecate_const 20000 background_white "$_omb_prompt_background_white" "Please use '_omb_prompt_background_white'."
_omb_deprecate_const 20000 background_orange "$_omb_prompt_background_orange" "Please use '_omb_prompt_background_orange'."
_omb_deprecate_const 20000 normal "$_omb_prompt_normal" "Please use '_omb_prompt_normal'."
_omb_deprecate_const 20000 reset_color "$_omb_prompt_reset_color" "Please use '_omb_prompt_reset_color'."
_omb_deprecate_const 20000 echo_black "$_omb_term_black" "Please use '_omb_term_black'."
_omb_deprecate_const 20000 echo_red "$_omb_term_red" "Please use '_omb_term_red'."
_omb_deprecate_const 20000 echo_green "$_omb_term_green" "Please use '_omb_term_green'."
_omb_deprecate_const 20000 echo_yellow "$_omb_term_yellow" "Please use '_omb_term_yellow'."
_omb_deprecate_const 20000 echo_blue "$_omb_term_blue" "Please use '_omb_term_blue'."
_omb_deprecate_const 20000 echo_purple "$_omb_term_magenta" "Please use '_omb_term_magenta'."
_omb_deprecate_const 20000 echo_cyan "$_omb_term_cyan" "Please use '_omb_term_cyan'."
_omb_deprecate_const 20000 echo_white "$_omb_term_white" "Please use '_omb_term_white'."
_omb_deprecate_const 20000 echo_orange "$_omb_term_orange" "Please use '_omb_term_orange'."
_omb_deprecate_const 20000 echo_bold_black "$_omb_term_bold_black" "Please use '_omb_term_bold_black'."
_omb_deprecate_const 20000 echo_bold_red "$_omb_term_bold_red" "Please use '_omb_term_bold_red'."
_omb_deprecate_const 20000 echo_bold_green "$_omb_term_bold_green" "Please use '_omb_term_bold_green'."
_omb_deprecate_const 20000 echo_bold_yellow "$_omb_term_bold_yellow" "Please use '_omb_term_bold_yellow'."
_omb_deprecate_const 20000 echo_bold_blue "$_omb_term_bold_blue" "Please use '_omb_term_bold_blue'."
_omb_deprecate_const 20000 echo_bold_purple "$_omb_term_bold_magenta" "Please use '_omb_term_bold_magenta'."
_omb_deprecate_const 20000 echo_bold_cyan "$_omb_term_bold_cyan" "Please use '_omb_term_bold_cyan'."
_omb_deprecate_const 20000 echo_bold_white "$_omb_term_bold_white" "Please use '_omb_term_bold_white'."
_omb_deprecate_const 20000 echo_bold_orange "$_omb_term_bold_orange" "Please use '_omb_term_bold_orange'."
_omb_deprecate_const 20000 echo_underline_black "$_omb_term_underline_black" "Please use '_omb_term_underline_black'."
_omb_deprecate_const 20000 echo_underline_red "$_omb_term_underline_red" "Please use '_omb_term_underline_red'."
_omb_deprecate_const 20000 echo_underline_green "$_omb_term_underline_green" "Please use '_omb_term_underline_green'."
_omb_deprecate_const 20000 echo_underline_yellow "$_omb_term_underline_yellow" "Please use '_omb_term_underline_yellow'."
_omb_deprecate_const 20000 echo_underline_blue "$_omb_term_underline_blue" "Please use '_omb_term_underline_blue'."
_omb_deprecate_const 20000 echo_underline_purple "$_omb_term_underline_magenta" "Please use '_omb_term_underline_magenta'."
_omb_deprecate_const 20000 echo_underline_cyan "$_omb_term_underline_cyan" "Please use '_omb_term_underline_cyan'."
_omb_deprecate_const 20000 echo_underline_white "$_omb_term_underline_white" "Please use '_omb_term_underline_white'."
_omb_deprecate_const 20000 echo_underline_orange "$_omb_term_underline_orange" "Please use '_omb_term_underline_orange'."
_omb_deprecate_const 20000 echo_background_black "$_omb_term_background_black" "Please use '_omb_term_background_black'."
_omb_deprecate_const 20000 echo_background_red "$_omb_term_background_red" "Please use '_omb_term_background_red'."
_omb_deprecate_const 20000 echo_background_green "$_omb_term_background_green" "Please use '_omb_term_background_green'."
_omb_deprecate_const 20000 echo_background_yellow "$_omb_term_background_yellow" "Please use '_omb_term_background_yellow'."
_omb_deprecate_const 20000 echo_background_blue "$_omb_term_background_blue" "Please use '_omb_term_background_blue'."
_omb_deprecate_const 20000 echo_background_purple "$_omb_term_background_magenta" "Please use '_omb_term_background_magenta'."
_omb_deprecate_const 20000 echo_background_cyan "$_omb_term_background_cyan" "Please use '_omb_term_background_cyan'."
_omb_deprecate_const 20000 echo_background_white "$_omb_term_background_white" "Please use '_omb_term_background_white'."
_omb_deprecate_const 20000 echo_background_orange "$_omb_term_background_orange" "Please use '_omb_term_background_orange'."
_omb_deprecate_const 20000 echo_normal "$_omb_term_normal" "Please use '_omb_term_normal'."
_omb_deprecate_const 20000 echo_reset_color "$_omb_term_reset_color" "Please use '_omb_term_reset_color'."