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

Merge pull request #13 from pik/master

Browse Source 
Reduce git and rbenv related rendering bottlenecks
This commit is contained in:
Justin Hileman 2015-10-26 10:14:52 -04:00
commit ac43ce0631
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fish_prompt.fish
View File

@ -322,7 +322,7 @@ function __bobthefish_prompt_git -a current_dir -d 'Display the actual git state
set -l new '' set -l new ''
set -l show_untracked (git config --bool bash.showUntrackedFiles) set -l show_untracked (git config --bool bash.showUntrackedFiles)
if [ "$theme_display_git_untracked" != 'no' -a "$show_untracked" != 'false' ] if [ "$theme_display_git_untracked" != 'no' -a "$show_untracked" != 'false' ]
set new (command git ls-files --other --exclude-standard) set new (command git ls-files --other --exclude-standard --directory)
if [ "$new" ] if [ "$new" ]
if [ "$theme_avoid_ambiguous_glyphs" = 'yes' ] if [ "$theme_avoid_ambiguous_glyphs" = 'yes' ]
set new '...' set new '...'
@ -393,16 +393,15 @@ end
function __bobthefish_prompt_rubies -d 'Display current Ruby (rvm/rbenv)' function __bobthefish_prompt_rubies -d 'Display current Ruby (rvm/rbenv)'
[ "$theme_display_ruby" = 'no' ]; and return [ "$theme_display_ruby" = 'no' ]; and return
set -l ruby_version if which rvm-prompt >/dev/null 2>&1
if type rvm-prompt >/dev/null 2>&1
set ruby_version (rvm-prompt i v g) set ruby_version (rvm-prompt i v g)
else if type rbenv >/dev/null 2>&1 else if which rbenv >/dev/null 2>&1
set ruby_version (rbenv version-name) set ruby_version (rbenv version-name)
# Don't show global ruby version... # Don't show global ruby version...
[ "$ruby_version" = (rbenv global) ]; and return set -q RBENV_ROOT; and set rbenv_root $RBENV_ROOT; or set rbenv_root ~/.rbenv
[ "$ruby_version" = (cat $rbenv_root/version 2>/dev/null; or echo 'system') ]; and return
end end
[ -z "$ruby_version" ]; and return [ -z "$ruby_version" ]; and return
__bobthefish_start_segment $__bobthefish_ruby_red $__bobthefish_lt_grey --bold __bobthefish_start_segment $__bobthefish_ruby_red $__bobthefish_lt_grey --bold
echo -n -s $ruby_version ' ' echo -n -s $ruby_version ' '
set_color normal set_color normal