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

- old
+ new

@@ -10,11 +10,11 @@ __rvm_version() { __rvm_meta ; echo "rvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]" ; } __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; } __rvm_parse_args() { - if [[ ! -z "$(echo "$*" | awk '/trace/')" ]] ; then echo "$*" ; fi + if echo "$*" | grep -q 'trace' ; then echo "$*" ; fi while [[ $# -gt 0 ]] ; do rvm_token="$1" ; shift case "$rvm_token" in fetch|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes) @@ -305,11 +305,11 @@ elif $rvm_scripts_path/match "$rvm_token" "-" ; then rvm_ruby_string="$rvm_token" elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then rvm_ruby_string="$rvm_token" rvm_action="${rvm_action:-use}" - elif $rvm_scripts_path/match "$rvm_token" "^ree" ; then + elif $rvm_scripts_path/match "$rvm_token" "^ree-" ; then rvm_ruby_string="$rvm_token" rvm_action="${rvm_action:-use}" else if $rvm_scripts_path/match "$rvm_token" "\.rb$" ; then # we have a specified ruby script rvm_ruby_args=$rvm_token @@ -387,10 +387,10 @@ monitor) export rvm_ruby_version rvm_ruby_string $rvm_scripts_path/monitor ; result=$? ;; notes) $rvm_scripts_path/notes ; result=$? ;; - reload) rvm_reload_flag=1 ;; + reload) unset rvm_loaded_flag ; rvm_reload_flag=1 ;; fetch|install|uninstall|remove) if [[ ! -z "$rvm_ruby_string" ]] ; then $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string" elif $rvm_scripts_path/match "$rvm_ruby_version" "," ; then $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_version"