Only check for a user defined variable if we really have an visual

identifier.
This commit is contained in:
Dominik Ritter 2015-12-15 02:43:42 +01:00
parent 409303f45d
commit 056d4ff29a

View file

@ -159,12 +159,14 @@ left_prompt_segment() {
local visual_identifier local visual_identifier
if [[ -n $5 ]]; then if [[ -n $5 ]]; then
visual_identifier="$(print_icon $5)" visual_identifier="$(print_icon $5)"
# Allow users to overwrite the color for the visual identifier only. if [[ -n "$visual_identifier" ]]; then
local visual_identifier_color_variable=POWERLEVEL9K_${(U)1#prompt_}_VISUAL_IDENTIFIER_COLOR # Allow users to overwrite the color for the visual identifier only.
set_default $visual_identifier_color_variable $3 local visual_identifier_color_variable=POWERLEVEL9K_${(U)1#prompt_}_VISUAL_IDENTIFIER_COLOR
visual_identifier="%F{${(P)visual_identifier_color_variable}%}$visual_identifier%f" set_default $visual_identifier_color_variable $3
# Add an whitespace if we print more than just the visual identifier visual_identifier="%F{${(P)visual_identifier_color_variable}%}$visual_identifier%f"
[[ -n $4 ]] && visual_identifier="$visual_identifier " # Add an whitespace if we print more than just the visual identifier
[[ -n $4 ]] && visual_identifier="$visual_identifier "
fi
fi fi
echo -n "$visual_identifier%{$fg%}$4$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS" echo -n "$visual_identifier%{$fg%}$4$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS"
@ -224,12 +226,14 @@ right_prompt_segment() {
local visual_identifier local visual_identifier
if [[ -n $5 ]]; then if [[ -n $5 ]]; then
visual_identifier="$(print_icon $5)" visual_identifier="$(print_icon $5)"
# Allow users to overwrite the color for the visual identifier only. if [[ -n "$visual_identifier" ]]; then
local visual_identifier_color_variable=POWERLEVEL9K_${(U)1#prompt_}_VISUAL_IDENTIFIER_COLOR # Allow users to overwrite the color for the visual identifier only.
set_default $visual_identifier_color_variable $3 local visual_identifier_color_variable=POWERLEVEL9K_${(U)1#prompt_}_VISUAL_IDENTIFIER_COLOR
visual_identifier="%F{${(P)visual_identifier_color_variable}%}$visual_identifier%f" set_default $visual_identifier_color_variable $3
# Add an whitespace if we print more than just the visual identifier visual_identifier="%F{${(P)visual_identifier_color_variable}%}$visual_identifier%f"
[[ -n $4 ]] && visual_identifier=" $visual_identifier" # Add an whitespace if we print more than just the visual identifier
[[ -n $4 ]] && visual_identifier=" $visual_identifier"
fi
fi fi
echo -n "$4$visual_identifier$POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS%f" echo -n "$4$visual_identifier$POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS%f"