Archives/oh-my-fish_theme-bobthefish
1
0
Fork 0
mirror of https://github.com/oh-my-fish/theme-bobthefish.git synced 2024-10-27 20:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of the last $__bobthefish_* global!

Browse Source
This commit is contained in:
Justin Hileman 2016-02-03 23:10:57 -08:00
parent c2b313408c
commit 6ca1ae9246
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fish_prompt.fish
View File

@ -25,8 +25,6 @@
# set -g theme_avoid_ambiguous_glyphs yes # set -g theme_avoid_ambiguous_glyphs yes
# set -g default_user your_normal_user # set -g default_user your_normal_user
set -g __bobthefish_current_bg NONE
# =========================== # ===========================
# Helper methods # Helper methods
# =========================== # ===========================
@ -123,21 +121,21 @@ function __bobthefish_start_segment -S -d 'Start a prompt segment'
set_color normal # clear out anything bold or underline... set_color normal # clear out anything bold or underline...
set_color -b $bg set_color -b $bg
set_color $fg $argv set_color $fg $argv
if [ "$__bobthefish_current_bg" = 'NONE' ]
switch "$__bobthefish_current_bg"
case ''
# If there's no background, just start one # If there's no background, just start one
echo -n ' ' echo -n ' '
else case "$bg"
# If there's already a background... # If the background is already the same color, draw a separator
if [ "$bg" = "$__bobthefish_current_bg" ]
# and it's the same color, draw a separator
echo -n "$__bobthefish_right_arrow_glyph " echo -n "$__bobthefish_right_arrow_glyph "
else case '*'
# otherwise, draw the end of the previous segment and the start of the next # otherwise, draw the end of the previous segment and the start of the next
set_color $__bobthefish_current_bg set_color $__bobthefish_current_bg
echo -n "$__bobthefish_right_black_arrow_glyph " echo -n "$__bobthefish_right_black_arrow_glyph "
set_color $fg $argv set_color $fg $argv
end end
end
set __bobthefish_current_bg $bg set __bobthefish_current_bg $bg
end end
@ -169,13 +167,14 @@ function __bobthefish_path_segment -S -a current_dir -d 'Display a shortened for
end end
function __bobthefish_finish_segments -S -d 'Close open prompt segments' function __bobthefish_finish_segments -S -d 'Close open prompt segments'
if [ -n $__bobthefish_current_bg -a $__bobthefish_current_bg != 'NONE' ] if [ "$__bobthefish_current_bg" != '' ]
set_color -b normal set_color -b normal
set_color $__bobthefish_current_bg set_color $__bobthefish_current_bg
echo -n "$__bobthefish_right_black_arrow_glyph " echo -n "$__bobthefish_right_black_arrow_glyph "
set_color normal set_color normal
end end
set -g __bobthefish_current_bg NONE
set __bobthefish_current_bg
end end
@ -520,6 +519,9 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
set -l __bobthefish_vagrant 48B4FB set -l __bobthefish_vagrant 48B4FB
# Start each line with a blank slate
set -l __bobthefish_current_bg
__bobthefish_prompt_status $last_status __bobthefish_prompt_status $last_status
__bobthefish_prompt_vi __bobthefish_prompt_vi
__bobthefish_prompt_vagrant __bobthefish_prompt_vagrant