Skip to content

O
oh-my-zsh
Commit 76fb7a25 authored by chieping's avatar chieping Committed by Marc Cornellà
Browse files
Options

rbenv: fix rbenv_prompt_info prefix and suffix (#3764) 

Closes #3764
parent 22fed4fb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
plugins/rbenv/rbenv.plugin.zsh
View file @ 76fb7a25
...@@ -47,11 +47,10 @@ if [[ $FOUND_RBENV -eq 1 ]]; then ...@@ -47,11 +47,10 @@ if [[ $FOUND_RBENV -eq 1 ]]; then
} }
function rbenv_prompt_info() { function rbenv_prompt_info() {
if [[ -n $(current_gemset) ]] ; then local ruby=$(current_ruby) gemset=$(current_gemset)
echo "$(current_ruby)@$(current_gemset)" echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
else [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
echo "$(current_ruby)" echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
fi
} }
else else
alias rubies="ruby -v" alias rubies="ruby -v"
...@@ -59,7 +58,11 @@ else ...@@ -59,7 +58,11 @@ else
function current_ruby() { echo "not supported" } function current_ruby() { echo "not supported" }
function current_gemset() { echo "not supported" } function current_gemset() { echo "not supported" }
function gems() { echo "not supported" } function gems() { echo "not supported" }
function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" } function rbenv_prompt_info() {
echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
}
fi fi
unset FOUND_RBENV rbenvdirs dir unset FOUND_RBENV rbenvdirs dir
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