Bugfix: 'rvm gemset use X' now works properly again.

rvm · May 4, 2010 · 8492265 · 8492265
1 parent 5c98210
commit 8492265
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/scripts/cli b/scripts/cli
@@ -59,7 +59,7 @@ __rvm_parse_args() {
         elif [[ "use" = "$1" ]] ; then
           rvm_use_flag=1
           rvm_ruby_args="$@" ; shift
-          rvm_gemset_name="$1"; shift
+          rvm_gemset_name="$1" ; shift
           if [[ ! -z "$(echo $rvm_gemset_name | grep $rvm_gemset_separator)" ]] ; then
             rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
             rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
@@ -68,7 +68,6 @@ __rvm_parse_args() {
             fi
             rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
-          if [[ ! -z "$rvm_gemset_name" ]] ; then rvm_gemset_name ; fi
         elif [[ "delete" = "$1" ]] ; then
           rvm_delete_flag=1
           rvm_ruby_args="$@" ; shift
@@ -81,13 +80,12 @@ __rvm_parse_args() {
             fi
             rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
-          if [[ ! -z "$rvm_gemset_name" ]] ; then rvm_gemset_name ; fi
         else
           if [[ -z "$1" ]] ; then
             rvm_action="error"
             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 rvm_ruby_string ;  fi
+            if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ;  fi
             rvm_ruby_args="$@"
           fi
         fi