Refactor config loading: step 6
Move the 'local' keyword in front of where each color variable is defined, for safer maintenance.
This commit is contained in:
parent
92384caac9
commit
a673a2e9fd
55
liquidprompt
55
liquidprompt
@ -117,15 +117,10 @@ esac
|
||||
_lp_source_config()
|
||||
{
|
||||
|
||||
# Colors declarations
|
||||
local BOLD BLACK BOLD_GRAY WHITE BOLD_WHITE \
|
||||
RED BOLD_RED WARN_RED CRIT_RED DANGER_RED \
|
||||
GREEN BOLD_GREEN YELLOW BOLD_YELLOW \
|
||||
BLUE BOLD_BLUE PURPLE PINK CYAN BOLD_CYAN
|
||||
|
||||
# TermInfo feature detection
|
||||
_lp_ti_sgr0="$( { tput sgr0 || tput me ; } 2>/dev/null )"
|
||||
_lp_ti_bold="$( { tput bold || tput md ; } 2>/dev/null )"
|
||||
local _lp_ti_sgr0="$( { tput sgr0 || tput me ; } 2>/dev/null )"
|
||||
local _lp_ti_bold="$( { tput bold || tput md ; } 2>/dev/null )"
|
||||
local _lp_ti_setaf
|
||||
if tput setaf >/dev/null 2>&1 ; then
|
||||
_lp_ti_setaf () { tput setaf "$1" ; }
|
||||
elif tput AF >/dev/null 2>&1 ; then
|
||||
@ -136,34 +131,36 @@ _lp_source_config()
|
||||
_lp_ti_setaf () { : ; }
|
||||
fi
|
||||
|
||||
# Colors
|
||||
BOLD="${_LP_OPEN_ESC}${_lp_ti_bold}${_LP_CLOSE_ESC}"
|
||||
# Colors: variables are local so they will have a value only
|
||||
# during config loading and will not conflict with other values
|
||||
# with the same names defined by the user outside the config.
|
||||
local BOLD="${_LP_OPEN_ESC}${_lp_ti_bold}${_LP_CLOSE_ESC}"
|
||||
|
||||
BLACK="${_LP_OPEN_ESC}$(_lp_ti_setaf 0)${_LP_CLOSE_ESC}"
|
||||
BOLD_GRAY="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 0)${_LP_CLOSE_ESC}"
|
||||
WHITE="${_LP_OPEN_ESC}$(_lp_ti_setaf 7)${_LP_CLOSE_ESC}"
|
||||
BOLD_WHITE="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 7)${_LP_CLOSE_ESC}"
|
||||
local BLACK="${_LP_OPEN_ESC}$(_lp_ti_setaf 0)${_LP_CLOSE_ESC}"
|
||||
local BOLD_GRAY="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 0)${_LP_CLOSE_ESC}"
|
||||
local WHITE="${_LP_OPEN_ESC}$(_lp_ti_setaf 7)${_LP_CLOSE_ESC}"
|
||||
local BOLD_WHITE="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 7)${_LP_CLOSE_ESC}"
|
||||
|
||||
RED="${_LP_OPEN_ESC}$(_lp_ti_setaf 1)${_LP_CLOSE_ESC}"
|
||||
BOLD_RED="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 1)${_LP_CLOSE_ESC}"
|
||||
WARN_RED="${_LP_OPEN_ESC}$(_lp_ti_setaf 0 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
CRIT_RED="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 7 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
DANGER_RED="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 3 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
local RED="${_LP_OPEN_ESC}$(_lp_ti_setaf 1)${_LP_CLOSE_ESC}"
|
||||
local BOLD_RED="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 1)${_LP_CLOSE_ESC}"
|
||||
local WARN_RED="${_LP_OPEN_ESC}$(_lp_ti_setaf 0 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
local CRIT_RED="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 7 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
local DANGER_RED="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 3 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
|
||||
GREEN="${_LP_OPEN_ESC}$(_lp_ti_setaf 2)${_LP_CLOSE_ESC}"
|
||||
BOLD_GREEN="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 2)${_LP_CLOSE_ESC}"
|
||||
local GREEN="${_LP_OPEN_ESC}$(_lp_ti_setaf 2)${_LP_CLOSE_ESC}"
|
||||
local BOLD_GREEN="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 2)${_LP_CLOSE_ESC}"
|
||||
|
||||
YELLOW="${_LP_OPEN_ESC}$(_lp_ti_setaf 3)${_LP_CLOSE_ESC}"
|
||||
BOLD_YELLOW="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 3)${_LP_CLOSE_ESC}"
|
||||
local YELLOW="${_LP_OPEN_ESC}$(_lp_ti_setaf 3)${_LP_CLOSE_ESC}"
|
||||
local BOLD_YELLOW="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 3)${_LP_CLOSE_ESC}"
|
||||
|
||||
BLUE="${_LP_OPEN_ESC}$(_lp_ti_setaf 4)${_LP_CLOSE_ESC}"
|
||||
BOLD_BLUE="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 4)${_LP_CLOSE_ESC}"
|
||||
local BLUE="${_LP_OPEN_ESC}$(_lp_ti_setaf 4)${_LP_CLOSE_ESC}"
|
||||
local BOLD_BLUE="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 4)${_LP_CLOSE_ESC}"
|
||||
|
||||
PURPLE="${_LP_OPEN_ESC}$(_lp_ti_setaf 5)${_LP_CLOSE_ESC}"
|
||||
PINK="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 5)${_LP_CLOSE_ESC}"
|
||||
local PURPLE="${_LP_OPEN_ESC}$(_lp_ti_setaf 5)${_LP_CLOSE_ESC}"
|
||||
local PINK="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 5)${_LP_CLOSE_ESC}"
|
||||
|
||||
CYAN="${_LP_OPEN_ESC}$(_lp_ti_setaf 6)${_LP_CLOSE_ESC}"
|
||||
BOLD_CYAN="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 6)${_LP_CLOSE_ESC}"
|
||||
local CYAN="${_LP_OPEN_ESC}$(_lp_ti_setaf 6)${_LP_CLOSE_ESC}"
|
||||
local BOLD_CYAN="${_LP_OPEN_ESC}${_lp_ti_bold}$(_lp_ti_setaf 6)${_LP_CLOSE_ESC}"
|
||||
|
||||
# NO_COL is special: it will be used at runtime, not just during config loading
|
||||
NO_COL="${_LP_OPEN_ESC}${_lp_ti_sgr0}${_LP_CLOSE_ESC}"
|
||||
|
Loading…
Reference in New Issue
Block a user