1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-11 00:00:06 +00:00

Merge pull request #681 from Stazer/tcolor-warning

Added flag to ignore checking the term colors & lang settings
This commit is contained in:
Ben Hilburn 2018-01-30 16:44:27 -05:00 committed by GitHub
commit fd3d234354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions

View file

@ -7,6 +7,10 @@
################################################################ ################################################################
function termColors() { function termColors() {
if [[ $POWERLEVEL9K_IGNORE_TERM_COLORS == true ]]; then
return
fi
local term_colors local term_colors
if which tput &>/dev/null; then if which tput &>/dev/null; then

View file

@ -1625,6 +1625,8 @@ NEWLINE='
[[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]] && PROMPT="$NEWLINE$PROMPT" [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]] && PROMPT="$NEWLINE$PROMPT"
} }
set_default POWERLEVEL9K_IGNORE_TERM_COLORS false
set_default POWERLEVEL9K_IGNORE_TERM_LANG false
prompt_powerlevel9k_setup() { prompt_powerlevel9k_setup() {
# The value below was set to better support 32-bit CPUs. # The value below was set to better support 32-bit CPUs.
# It's the maximum _signed_ integer value on 32-bit CPUs. # It's the maximum _signed_ integer value on 32-bit CPUs.
@ -1647,6 +1649,7 @@ prompt_powerlevel9k_setup() {
termColors termColors
# If the terminal `LANG` is set to `C`, this theme will not work at all. # If the terminal `LANG` is set to `C`, this theme will not work at all.
if [[ $POWERLEVEL9K_IGNORE_TERM_LANG == false ]]; then
local term_lang local term_lang
term_lang=$(echo $LANG) term_lang=$(echo $LANG)
if [[ $term_lang == 'C' ]]; then if [[ $term_lang == 'C' ]]; then
@ -1655,6 +1658,7 @@ prompt_powerlevel9k_setup() {
print -P "\t%F{red}WARNING!%f _before_ loading this theme in your \~\.zshrc. Putting" print -P "\t%F{red}WARNING!%f _before_ loading this theme in your \~\.zshrc. Putting"
print -P "\t%F{red}WARNING!%f %F{blue}export LANG=\"en_US.UTF-8\"%f at the top of your \~\/.zshrc is sufficient." print -P "\t%F{red}WARNING!%f %F{blue}export LANG=\"en_US.UTF-8\"%f at the top of your \~\/.zshrc is sufficient."
fi fi
fi
defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs) defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
defined POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS || POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs history time) defined POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS || POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs history time)