scripts/cli in rvm-0.0.84 vs scripts/cli in rvm-0.0.85

- old
+ new

@@ -102,11 +102,11 @@ else if $rvm_scripts_path/match "$1" "^[0-9]" ; then rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift unset rvm_ruby_interpreter else - if [[ "jruby" = "$1" ]] || [[ "rbx" = "$1" ]] || [[ "rubinius" = "$1" ]] || [[ "macruby" = "$1" ]] || [[ "ree" = "$1" ]] || [[ "mput" = "$1" ]] || [[ "shyouhei" = "$1" ]] ; then + if $rvm_scripts_path/match "rbx jruby rubinius macruby ree mput shyouhei" "$1" ; then rvm_ruby_interpreter=$1 ; shift else unset rvm_ruby_interpreter rvm_ruby_version fi fi @@ -356,14 +356,11 @@ monitor) export rvm_ruby_version rvm_ruby_string $rvm_scripts_path/monitor ; result=$? ;; notes) $rvm_scripts_path/notes ; result=$? ;; - reload) - shift;shift;unset rvm_action; - source "$rvm_path/scripts/rvm" - ;; + reload) rvm_reload_flag=1 ; break ;; install|uninstall) __rvm_manage_rubies ; result=$? ;; tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;; iconv|openssl|ncurses|zlib|readline|curl) __rvm_${rvm_action}_install @@ -388,9 +385,12 @@ else __rvm_usage fi result=1 esac + + + if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi return $result }