Merge remote-tracking branch 'origin/master'

1 files changed, 46 insertions, 46 deletions

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 0f2d366e2..d758aebae 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -4,65 +4,65 @@
 FOUND_RBENV=$+commands[rbenv]
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
-    rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
-    for dir in $rbenvdirs; do
-        if [[ -d $dir/bin ]]; then
-            export PATH="$dir/bin:$PATH"
-            FOUND_RBENV=1
-            break
-        fi
-    done
+  rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
+  for dir in $rbenvdirs; do
+    if [[ -d $dir/bin ]]; then
+      export PATH="$dir/bin:$PATH"
+      FOUND_RBENV=1
+      break
+    fi
+  done
 fi
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
-    if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
-        if [[ -d $dir/bin ]]; then
-            export PATH="$dir/bin:$PATH"
-            FOUND_RBENV=1
-        fi
+  if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
+    if [[ -d $dir/bin ]]; then
+      export PATH="$dir/bin:$PATH"
+      FOUND_RBENV=1
     fi
+  fi
 fi
 
 if [[ $FOUND_RBENV -eq 1 ]]; then
-    eval "$(rbenv init --no-rehash - zsh)"
+  eval "$(rbenv init --no-rehash - zsh)"
 
-    alias rubies="rbenv versions"
-    alias gemsets="rbenv gemset list"
+  alias rubies="rbenv versions"
+  alias gemsets="rbenv gemset list"
 
-    function current_ruby() {
-        echo "$(rbenv version-name)"
-    }
+  function current_ruby() {
+    echo "$(rbenv version-name)"
+  }
 
-    function current_gemset() {
-        echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
-    }
+  function current_gemset() {
+    echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
+  }
 
-    function gems() {
-        local rbenv_path=$(rbenv prefix)
-        gem list $@ | sed -E \
-          -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-          -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
-          -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-          -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
-    }
+  function gems() {
+    local rbenv_path=$(rbenv prefix)
+    gem list $@ | sed -E \
+      -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+      -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
+      -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+      -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+  }
 
-    function rbenv_prompt_info() {
-        local ruby=$(current_ruby) gemset=$(current_gemset)
-        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-        [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
-        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
-    }
+  function rbenv_prompt_info() {
+    local ruby=${$(current_ruby):gs/%/%%} gemset=${$(current_gemset):gs/%/%%}
+    echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
+    [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 else
-    alias rubies="ruby -v"
-    function gemsets() { echo "not supported" }
-    function current_ruby() { echo "not supported" }
-    function current_gemset() { echo "not supported" }
-    function gems() { echo "not supported" }
-    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}"
-    }
+  alias rubies="ruby -v"
+  function gemsets() { echo "not supported" }
+  function current_ruby() { echo "not supported" }
+  function current_gemset() { echo "not supported" }
+  function gems() { echo "not supported" }
+  function rbenv_prompt_info() {
+    echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
+    echo -n "system: $(ruby -v | cut -f-2 -d ' ' | sed 's/%/%%/g')"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 fi
 
 unset FOUND_RBENV rbenvdirs dir