scripts/cli in rvm-0.0.97 vs scripts/cli in rvm-0.0.98

- old
+ new

@@ -47,11 +47,11 @@ rvm_action=${rvm_action:-use} rvm_ruby_interpreter="$rvm_token" rvm_ruby_string="$rvm_token" ;; - jruby|ree|macruby|rbx|rubinius|mput|shyouhei|default|all) + jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|all) rvm_ruby_interpreter="$rvm_token" rvm_ruby_string="$rvm_token" rvm_action="${rvm_action:-use}" if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi ;; @@ -108,11 +108,11 @@ else if $rvm_scripts_path/match "$1" "^[0-9]" ; then rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift unset rvm_ruby_interpreter else - if $rvm_scripts_path/match "rbx jruby rubinius macruby ree mput shyouhei" "$1" ; then + if $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius mput shyouhei ironruby" "$1" ; then rvm_ruby_interpreter=$1 ; shift else unset rvm_ruby_interpreter rvm_ruby_version fi fi @@ -264,12 +264,14 @@ --archflags) rvm_archflags="$1" ; shift ;; tests|specs) rvm_action="tests" ;; --trace) export rvm_trace_flag=1 ; set -x ;; --symlink) rvm_symlink_name="$1" ; shift ;; + --disable-llvm|--disable-jit) export rvm_jit_flag=0 ;; + --enable-llvm|--enable-jit) export rvm_jit_flag=1 ;; - --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor) + --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor) export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1 if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi ;; reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth) @@ -426,12 +428,12 @@ __rvm_usage fi result=1 esac - if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi + if [[ ! -z "$rvm_reload_flag" ]] ; then source "$rvm_path/scripts/rvm" ; fi - if [[ "$rvm_trace_flag" -eq 1 ]] ; then set +x ; unset rvm_trace_flag ; fi + if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi return $result }