scripts/cli in rvm-0.0.57 vs scripts/cli in rvm-0.0.58

- old
+ new

@@ -2,12 +2,12 @@ function __rvm_meta { rvm_meta_author="Wayne E. Seguin" rvm_meta_author_email="wayneeseguin@gmail.com" rvm_meta_website="http://rvm.beginrescueend.com/" - rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`" - rvm_meta_updated="2009.10.10" + rvm_meta_version="$(cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" + rvm_meta_updated="2009.10.12" } function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; } function __rvm_usage { @@ -111,11 +111,11 @@ rvm_action=$rvm_token ;; use) rvm_action=$rvm_token - if [ "$1" = "ruby" ] ; then shift ; fi + if [ "ruby" = "$1" ] ; then shift ; fi ;; inspect) rvm_action=$rvm_token rvm_ruby_args=$* @@ -140,58 +140,52 @@ fi ;; gems|gemset) rvm_action="gems" - if [ "$1" = "name" -o "$1" = "dir" -o "$1" = "list" -o "$1" = "empty" -o "$1" = "delete" ] ; then + if [ "name" = "$1" -o "$1" = "dir" -o "$1" = "list" -o "$1" = "empty" -o "$1" = "delete" ] ; then eval "rvm_${1}_flag=1" ; shift - elif [ "$1" = "dump" -o "$1" = "load" ] ; then + elif [ "dump" = "$1" -o "$1" = "load" ] ; then eval "rvm_${1}_flag=1" ; shift else rvm_use_flag=1 # Default is to use the (named) gem set. fi ;; gemdir) rvm_action=$rvm_token - if [ "$1" = "system" ] ; then rvm_ruby_interpreter="system" ; shift ; fi - if [ "$1" = "user" ] ; then rvm_ruby_interpreter="user" ; shift ; fi + 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}" ;; --load|load|dump) rvm_action=gems eval "rvm_${rvm_token}_flag=1" - if [ ! -z "$1" ] ; then - rvm_file_name="$(echo $1 | sed 's/\.gems//').gems" - shift - else - rvm_file_name="$rvm_gem_set_name.gems" - fi ;; gemdup) rvm_action=$rvm_token if [ -z "$1" ] ; then rvm_ruby_interpreter="default" - elif [ "$1" = "system" ] ; then + elif [ "system" = "$1" ] ; then rvm_ruby_interpreter=$1 ; shift - elif [ "$1" = "user" ] ; then + elif [ "user" = "$1" ] ; then rvm_ruby_interpreter=$1 ; shift - elif [ "$1" = "default" ] ; then + elif [ "default" = "$1" ] ; then rvm_ruby_interpreter=$1 ; shift else rvm_ruby_interpreter=$1 ; shift rvm_ruby_version=$2 ; shift fi ;; do|ruby|rake|gem|rubydo|rakedo|gemdo) - if [ "$rvm_action" = "do" ] ; then rvm_action="ruby" ; fi + if [ "do" = "$rvm_action" ] ; then rvm_action="ruby" ; fi rvm_action=$(echo $rvm_token | sed 's/do//g') - if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then + if [ "rake" = "$rvm_action" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then if [ -z "$1" ] ; then rvm_action="error" rvm_error_message="the 'ruby' and 'gem' actions must be followed by arguments." rvm_parse_break=1 else @@ -205,11 +199,11 @@ else if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift unset rvm_ruby_interpreter else - if [ "$1" = "jruby" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" -o "$1" = "ree" -o "$1" = "ruby-enterprise" ] ; then + if [ "jruby" = "$1" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" -o "$1" = "ree" -o "$1" = "ruby-enterprise" ] ; then rvm_ruby_interpreter=$1 ; shift else unset rvm_ruby_interpreter rvm_ruby_version fi fi @@ -231,13 +225,13 @@ 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 [ "$rvm_token" = "1.3" ] ; then + if [ "1.3" = "$rvm_token" ] ; then rvm_ruby_version="1.3.1" - elif [ "$rvm_token" = "1.4" ] ; then + 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} @@ -280,11 +274,11 @@ rvm_action="${rvm_action:-use}" shift ;; --bin) - if [ "$rvm_action" = "update" ] ; then + if [ "update" = "$rvm_action" ] ; then rvm_bin_flag=1 else rvm_bin_path="$1" ; shift fi ;; @@ -355,10 +349,11 @@ --archives) rvm_archives_path="$1" ; shift ;; --make) rvm_ruby_make="$1" ; shift ;; --make-install) rvm_ruby_make_install="$1"; shift ;; --nice) rvm_niceness="$1" ; shift ;; -l|--level) rvm_ruby_patch_level="$1" ; shift ;; + # TODO: handle this below better (if $1 is null) -m|--gem-set) rvm_gem_set_name="$1" ; shift ;; tests|specs) rvm_action="tests" ;; --trace) eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1" @@ -370,13 +365,18 @@ reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth) $rvm_action="reboot" ;; + --) + rvm_ruby_args="$*" + rvm_parse_break=1 + ;; + *) if [ ! -z "$rvm_token" ] ; then - if [ "$rvm_action" = "gems" ] ; then + if [ "gems" = "$rvm_action" ] ; then if [ -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then rvm_gem_set_name=$(echo $rvm_token | sed 's/\.gems//g') else rvm_file_name="$(echo $rvm_token | sed 's/\.gems//g').gems" fi @@ -384,11 +384,11 @@ rvm_ruby_version="$rvm_token" if [ -z "$rvm_action" ] ; then rvm_action="do" # Not sure if we really want to do this but we'll try it out. fi else - if [ ! -z "`echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null`" ] ; then # we have a specified ruby script + if [ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null)" ] ; 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" # Not sure if we really want to do this but we'll try it out. fi @@ -399,11 +399,11 @@ fi else rvm_action="error" rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'" fi - if [ "$rvm_action" = "error" ] ; then + if [ "error" = "$rvm_action" ] ; then break; fi esac if [ ! -z "$rvm_parse_break" -o ! -z "$rvm_error_message" ] ; then unset rvm_parse_break; break; fi @@ -449,11 +449,11 @@ __rvm_manage_rubies result=$? ;; gemsync) - rvm_source_gem_path=`__rvm_select ; echo $rvm_ruby_gem_home` + rvm_source_gem_path=$(__rvm_select ; echo $rvm_ruby_gem_home) __rvm_gem_sync ;; tests|specs) rvm_summary_flag=1 @@ -462,11 +462,11 @@ ;; info|debug) __rvm_version __rvm_info - if [ "$rvm_action" = "debug" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi + if [ "debug" = "$rvm_action" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi ;; error) __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" __rvm_pushpop @@ -480,10 +480,10 @@ __rvm_usage fi result=1 esac - if [ "$rvm_trace_flag" = "1" ] ; then set +x ; unset rvm_trace_flag ; fi + if [ "1" = "$rvm_trace_flag" ] ; then set +x ; unset rvm_trace_flag ; fi return $result }