refact(scorphish): display nada when there's neither venv nor ruby

parent afe748e4
# name: scorphish # name: scorphish
function _prompt_rubies -d 'Display current Ruby (rvm/rbenv)' function _prompt_rubies -a sep_color -a ruby_color -d 'Display current Ruby (rvm/rbenv)'
[ "$theme_display_ruby" = 'no' ]; and return [ "$theme_display_ruby" = 'no' ]; and return
set -l ruby_version set -l ruby_version
if type rvm-prompt >/dev/null 2>&1 if type rvm-prompt >/dev/null 2>&1
...@@ -8,16 +8,16 @@ function _prompt_rubies -d 'Display current Ruby (rvm/rbenv)' ...@@ -8,16 +8,16 @@ function _prompt_rubies -d 'Display current Ruby (rvm/rbenv)'
else if type rbenv >/dev/null 2>&1 else if type 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 echo -n -s '--'; and return [ "$ruby_version" = (rbenv global) ]; and return
end end
[ -z "$ruby_version" ]; and return [ -z "$ruby_version" ]; and return
echo -n -s $ruby_version echo -n -s $sep_color '|' $ruby_color $ruby_version
end end
function _prompt_virtualfish -d "Display activated virtual environment (only for virtualfish, virtualenv's activate.fish changes prompt by itself)" function _prompt_virtualfish -a sep_color -a venv_color -d "Display activated virtual environment (only for virtualfish, virtualenv's activate.fish changes prompt by itself)"
[ "$theme_display_virtualenv" = 'no' -o -z "$VIRTUAL_ENV" ]; and echo -n -s '--'; and return [ "$theme_display_virtualenv" = 'no' -o -z "$VIRTUAL_ENV" ]; and return
echo -n -s (basename "$VIRTUAL_ENV") echo -n -s $sep_color '|' $venv_color (basename "$VIRTUAL_ENV")
end end
function _git_branch_name function _git_branch_name
...@@ -62,15 +62,9 @@ function fish_prompt ...@@ -62,15 +62,9 @@ function fish_prompt
set_color -o blue set_color -o blue
printf '%s' (prompt_pwd) printf '%s' (prompt_pwd)
set_color -o 666 _prompt_rubies (set_color -o 666) (set_color -o red)
printf '|'
set_color -o red
_prompt_rubies
set_color -o 666 _prompt_virtualfish (set_color -o 666) (set_color -o green)
printf '|'
set_color -o green
_prompt_virtualfish
set_color -o 666 set_color -o 666
if set -q SCORPHISH_GIT_INFO_ON_FIRST_LINE if set -q SCORPHISH_GIT_INFO_ON_FIRST_LINE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment