From 4f68928aa44e66991821f39c9b1b4c1d59a0de51 Mon Sep 17 00:00:00 2001
From: Zhao Cai <caizhaoff@gmail.com>
Date: Thu, 16 Aug 2012 02:25:26 -0400
Subject: [PATCH] update _rvm from newest rvm updates

---
 src/_rvm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/_rvm b/src/_rvm
index a252786..356ec22 100644
--- a/src/_rvm
+++ b/src/_rvm
@@ -18,13 +18,14 @@
 # vim: ft=zsh sw=2 ts=2 et
 # ------------------------------------------------------------------------------
 
+typeset curcontext state line cmds ret
 
-local curcontext="$curcontext" state line cmds ret=1
+curcontext="$curcontext"
+ret=1
 
 _arguments -C \
   '(- 1 *)'{-v,--version}'[display version information]' \
   '(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
-  '(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
   '(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
   '(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
   '(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
@@ -42,7 +43,7 @@ _arguments -C \
   '(--default)--default[with ruby select, sets a default ruby for new shells]' \
   '(--debug)--debug[Toggle debug mode on for very verbose output]' \
   '(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
-  '(--force)--force[Force install, removes old install & source before install]' \
+  '(--force)--force[Force install, even given ruby is already install]' \
   '(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
   '(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
   '(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
@@ -55,7 +56,7 @@ case $state in
 
   cmds)
 
-    cmds=( ${(f)"$(_call_program commands rvm help 2> /dev/null | sed -e '/^== Action/,/^== Implementation/!d; / - /!d; s/^[ *]*\([^ ]*\) *\- *\(.*\)/\1:\2/')"} )
+    cmds=( ${(f)"$(_call_program commands rvm help 2> /dev/null | sed -e '/^== Action/,/^== Implementation/!d; / :: /!d; s/^[ *]*\([^ ]*\) *:: *\(.*\)/\1:\2/')"} )
     cmds+=( $(rvm list strings) )
     _describe -t commands 'rvm command' cmds && ret=0
     ;;
@@ -68,7 +69,7 @@ case $state in
 
         if (( CURRENT == 3 )); then
           # See if we’ve made it to the ‘@’; eg, 1.9.2@
-          if ! \grep -q '@' <<< "${line[CURRENT-1]}" ; then
+          if ! GREP_OPTIONS="" \grep '@' <<< "${line[CURRENT-1]}" >/dev/null ; then
             _values -S , 'rubies' \
               $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') \
               default system $(rvm alias list | cut -d' ' -f1) && ret=0
@@ -91,8 +92,8 @@ case $state in
         if (( CURRENT == 3 )); then
           _values 'gemset_commands' $(rvm gemset | sed -e '/create/!d; s/^.*[{]\(.*\)[}].*$/\1/; s/,/ /g')
         else
-          #_values -S , 'gemsets' $(rvm gemset list | \grep -v gemset 2>/dev/null)
-          _values -S , 'gemsets' $(rvm gemset list | \grep -Ev '(gemset|info)' 2>/dev/null | awk '/^[ -_[:alnum:]]+$/ {print '$1'}')
+          #_values -S , 'gemsets' $(rvm gemset list | GREP_OPTIONS="" \grep -v gemset 2>/dev/null)
+          _values -S , 'gemsets' $(rvm gemset list | GREP_OPTIONS="" \grep -Ev '(gemset|info)' 2>/dev/null | awk '/^[ -_[:alnum:]]+$/ {print '$1'}')
         fi
         ret=0
         ;;