scripts/cli in rvm-0.0.75 vs scripts/cli in rvm-0.0.76

- old
+ new

@@ -21,10 +21,11 @@ rvm_action=$rvm_token ;; use) rvm_action=$rvm_token + rvm_verbose_flag=1 if [[ "ruby" = "$1" ]] ; then shift ; fi ;; inspect) rvm_action=$rvm_token @@ -42,10 +43,11 @@ rvm_ruby_string="$rvm_token" ;; jruby|ree|macruby|rbx|rubinius|mput|shyouhei|default|all) rvm_ruby_interpreter="$rvm_token" + rvm_ruby_string="$rvm_token" rvm_action="${rvm_action:-use}" if match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi ;; gems|gemset) @@ -59,13 +61,12 @@ fi ;; gemdir) rvm_action=$rvm_token - if [[ "system" = "$1" ]] ; then rvm_ruby_interpreter="system" ; shift ; fi - if [[ "user" = "$1" ]] ; then rvm_ruby_interpreter="user" ; shift ; fi - rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}" + if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi + if [[ "user" = "$1" ]] ; then rvm_user_flag=1 ; shift ; fi ;; --load|load|dump|clear) rvm_action="gems" eval "rvm_${rvm_token}_flag=1" @@ -87,11 +88,11 @@ fi ;; -S|-e) rvm_action="ruby" - rvm_ruby_args="$rvm_token '$@'" + rvm_ruby_args="$rvm_token $@" rvm_parse_break=1 ;; do|ruby|rake|gem|rubydo|rakedo|gemdo) if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi @@ -136,28 +137,10 @@ specs|tests) rvm_action="do" rvm_ruby_args="rake $rvm_token" ;; - #1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2) - # rvm_ruby_interpreter=${rvm_ruby_interpreter:-ruby} - # rvm_ruby_version="$rvm_token" - # rvm_action=${rvm_action:-use} - #;; - - #1.2.0|1.3|1.3.0|1.3.1|1.4|1.4.0) - # if [[ "1.3" = "$rvm_token" ]] ; then - # rvm_ruby_version="1.3.1" - # elif [[ "1.4" = "$rvm_token" ]] ; then - # rvm_ruby_version="1.4.0" - # else - # rvm_ruby_version="$rvm_token" - # fi - # rvm_ruby_interpreter=${rvm_ruby_interpreter:-jruby} - # rvm_action=${rvm_action:-use} - #;; - -v|--version) if [[ -z "$1" ]] ; then rvm_action="version" else rvm_ruby_version="$1" @@ -279,10 +262,10 @@ --archflags) rvm_archflags="$1" ; shift ;; tests|specs) rvm_action="tests" ;; --trace) eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1" ; set -x ;; - --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete) + --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose) eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1" ;; reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth) $rvm_action="reboot"