Bugfix: 'rvm gems use X' uses X again :)

rvm · Mar 3, 2010 · 2b043f6 · 2b043f6
1 parent 3a28041
commit 2b043f6
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/scripts/cli b/scripts/cli
@@ -59,24 +59,33 @@ __rvm_parse_args() {
           export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
           rvm_ruby_args="clear"
           rvm_parse_break=1
-        elif [[ "delete" = "$1" ]] || [[ "use" = "$1" ]] ; then
-          eval "rvm_${rvm_token}_flag=1"
+        elif [[ "use" = "$1" ]] ; then
+          rvm_use_flag=1
           rvm_ruby_args="$@" ; shift
           rvm_gemset_name="$1"; shift
-          rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
-          rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
-          export "rvm_${rvm_token1}_flag" rvm_ruby_args rvm_gemset_name
-          if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; else unset rvm_ruby_string ; fi
+          if [[ -z "$(echo $rvm_gemset_name | grep '%')" ]] ; then
+            rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
+            rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+            export rvm_use_flag rvm_ruby_args
+            if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; else unset rvm_ruby_string ; fi
+          fi
           if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
+        #elif [[ "delete" = "$1" ]] ; then
+        #  rvm_${rvm_token}_flag=1
+        #  rvm_ruby_args="$@" ; shift
+        #  rvm_gemset_name="$1"; shift
+        #  rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
+        #  rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+        #  export rvm_${rvm_token1}_flag rvm_ruby_args rvm_gemset_name
+        #  if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; else unset rvm_ruby_string ; fi
+        #  if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
         else
           if [[ -z "$1" ]] ; then
             rvm_action="error"
-            rvm_error_message="'gems' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
+            rvm_error_message="'gemset' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
           else
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; else unset rvm_ruby_string ; fi
-            rvm_ruby_args="$@"
-            eval "rvm_${rvm_token1}_flag=1"
-            eval "export rvm_ruby_args rvm_${rvm_token}_flag"
+            rvm_ruby_args="$@" ; export rvm_ruby_args
             rvm_parse_break=1
           fi
         fi
@@ -413,8 +422,8 @@ rvm() {
       result=$?
     ;;
     gemset)
-      if $rvm_scripts_path/match $rvm_ruby_args use ; then
-        #if [[ "$rvm_use_flag" -eq 1 ]] ; then
+      #if $rvm_scripts_path/match $rvm_ruby_args use ; then
+      if [[ "$rvm_use_flag" -eq 1 ]] ; then
         __rvm_gemset_select
         result=$? ; if [[ $result -eq 0 ]] ; then
           __rvm_gemset_use