scripts/cli in rvm-0.1.16 vs scripts/cli in rvm-0.1.18
- old
+ new
@@ -6,11 +6,11 @@
if echo "$*" | grep -q 'trace' ; then echo "$*" ; __rvm_version ; fi
while [[ $# -gt 0 ]] ; do
rvm_token="$1" ; shift
case "$rvm_token" in
- fetch|info|version|srcdir|list|rubies|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
+ fetch|version|srcdir|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
rvm_action=$rvm_token
;;
use)
rvm_action=$rvm_token
@@ -18,11 +18,11 @@
if [[ "ruby" = "$1" ]] ; then shift ; fi
;;
inspect)
rvm_action=$rvm_token
- rvm_ruby_args=$*
+ export rvm_ruby_args=$*
rvm_parse_break=1
;;
install|uninstall)
export ${rvm_token}_flag=1
@@ -48,35 +48,32 @@
if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
;;
gems|gemset)
rvm_action="gems"
- if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "copy" = "$1" ]] || [[ "import" = "$1" ]] || [[ "export" = "$1" ]] ; then
- export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
- elif [[ "clear" = "$1" ]] ; then
+ if [[ "clear" = "$1" ]] ; then
unset rvm_gem_set_name ; shift
export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
export GEM_HOME="$rvm_ruby_gem_home"
export BUNDLE_PATH="$rvm_ruby_gem_home"
export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
rvm_ruby_args="clear"
rvm_parse_break=1
- elif [[ "delete" = "$1" ]] ; then
- export rvm_delete_flag=1
- rvm_ruby_args="$*" ; shift
+ elif [[ "delete" = "$1" ]] || [[ "use" = "$1" ]] ; then
+ export rvm_${1}_flag=1
+ export rvm_ruby_args="$*" ; shift
rvm_gem_set_name="$1"; shift
rvm_ruby_string=$(echo $rvm_gem_set_name | sed 's/\(.*\)%.*/\1/')
rvm_gem_set_name=$(echo $rvm_gem_set_name | sed 's/.*%\(.*\)/\1/')
if [[ "$rvm_ruby_string" != "$rvm_gem_set_name" ]] ; then export rvm_ruby_string ; fi
if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
else
if [[ -z "$1" ]] ; then
rvm_action="error"
rvm_error_message="'gems' must be followed by a gems(et) action, see http://rvm.beginrescueend.com/gemsets/#managing for details."
else
- rvm_gem_set_name="$1" ; shift
- export rvm_use_flag=1 # Default is to use the (named) gem set.
+ export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
fi
fi
;;
gemdir)
@@ -84,18 +81,25 @@
rvm_gemdir_flag=1
if [[ "system" = "$1" ]] ; then export rvm_system_flag=1 ; shift ; fi
if [[ "user" = "$1" ]] ; then export rvm_user_flag=1 ; shift ; fi
;;
+ list|info|strings)
+ rvm_action="$rvm_token"
+ export rvm_ruby_args="$@"
+ rvm_parse_break=1
+ ;;
+
-S)
rvm_action="ruby"
- rvm_ruby_args="$rvm_token $@"
+ export rvm_ruby_args="$rvm_token $@"
rvm_parse_break=1
;;
+
-e)
rvm_action="ruby"
- rvm_ruby_args="$rvm_token \"$@\""
+ export 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
@@ -279,11 +283,11 @@
--trace) export rvm_trace_flag=1 ; set -x ;;
--proxy) export rvm_proxy="$1" ; shift ;;
--disable-llvm|--disable-jit) export rvm_llvm_flag=0 ;;
--enable-llvm|--enable-jit) export rvm_llvm_flag=1 ;;
- --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky_gems)
+ --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky)
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)
@@ -375,28 +379,33 @@
__rvm_load_defaults
__rvm_parse_args $@
result=0
case "$rvm_action" in
- use) __rvm_use ; result=$? ;;
- srcdir) __rvm_source_dir ; result=$? ;;
- list) __rvm_list ; result=$? ;;
- rubies) __rvm_rubies ; result=$? ;;
- version) __rvm_version ; result=$? ;;
- reset) __rvm_reset ; result=$? ;;
- implode) __rvm_implode ; result=$? ;;
- update) __rvm_update ; result=$? ;;
- reboot) __rvm_reboot ; result=$? ;;
- usage|help) __rvm_usage ; result=$? ;;
- benchmark) __rvm_benchmark ; result=$? ;;
- inspect) __rvm_inspect ; result=$? ;;
- ruby|gem|rake) __rvm_do ; result=$? ;;
+ use) __rvm_use ; result=$? ;;
+ srcdir) __rvm_source_dir ; result=$? ;;
+ list) __rvm_list ; result=$? ;;
+ strings) __rvm_strings ; result=$? ;;
+ info) __rvm_info ; result=$? ;;
+ debug) __rvm_debug ; result=$? ;;
+ version) __rvm_version ; result=$? ;;
+ reset) __rvm_reset ; result=$? ;;
+ implode) __rvm_implode ; result=$? ;;
+ update) __rvm_update ; result=$? ;;
+ reboot) __rvm_reboot ; result=$? ;;
+ usage|help) __rvm_usage ; result=$? ;;
+ benchmark) __rvm_benchmark ; result=$? ;;
+ inspect) __rvm_inspect ; result=$? ;;
+ ruby|gem|rake) __rvm_do ; result=$? ;;
gemdir) $rvm_scripts_path/gems gemdir ; result=$? ;;
gems)
if [[ "$rvm_use_flag" -eq 1 ]] ; then
__rvm_gems_select
- __rvm_gems_use
+ result=$?
+ if [[ $result -eq 0 ]] ; then
+ __rvm_gems_use
+ fi
else
$rvm_scripts_path/gems $rvm_ruby_args
fi
result=$?
;;
@@ -422,14 +431,9 @@
iconv|openssl|ncurses|zlib|readline|curl|mono)
__rvm_${rvm_action}_install
result=$?
;;
- info|debug)
- __rvm_version
- __rvm_info
- if [[ "debug" = "$rvm_action" ]] ; then export rvm_debug_flag=1 ; __rvm_debug ; fi
- ;;
error)
$rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
__rvm_pushpop
result=1