cli in rvm-1.0.22

- old
+ new

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
-__rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
+__rvm_usage() {
+  eval "${PAGER:-less -X} '${rvm_path:-$HOME/.rvm}/README'"
+}
 
 __rvm_run_script()
 {
   local rvm_script_name="${1:-"$rvm_action"}"
 
@@ -573,11 +575,13 @@
 
           else
             if "$rvm_path/scripts/match" "$rvm_token" ".rb$" ; then # we have a specified ruby script
               rvm_ruby_args="$rvm_token"
               rvm_ruby_file="$rvm_token"
-              if [[ -z "${rvm_action:-""}" ]] ; then rvm_action="ruby" ; fi
+              if [[ -z "${rvm_action:-""}" || "$rvm_action" = "use" ]]; then
+                rvm_action="ruby"
+              fi
             else
               rvm_action="error"
               rvm_error_message="Unrecognized command line argument: '$rvm_token'"
             fi
           fi
@@ -723,10 +727,10 @@
 
           if [[ "${GEM_HOME:-""}" = "${gem_prefix}${rvm_gemset_separator:-"@"}${rvm_gemset_name}" ]] ; then
             rvm_ruby_gem_home="$gem_prefix"
             GEM_HOME="$rvm_ruby_gem_home"
             BUNDLE_PATH="$rvm_ruby_gem_home"
-            GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}global/bin"
+            GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}global"
             export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
           fi
           unset gem_prefix
         fi
       fi