scripts/cli in rvm-0.0.86 vs scripts/cli in rvm-0.0.87
- old
+ new
@@ -15,11 +15,11 @@
if [[ ! -z "$(echo "$*" | awk '/trace/')" ]] ; then echo "$*" ; fi
while [[ $# -gt 0 ]] ; do
rvm_token="$1" ; shift
case "$rvm_token" in
- install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
+ fetch|install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
rvm_action=$rvm_token
;;
use)
rvm_action=$rvm_token
@@ -149,10 +149,23 @@
rvm_ruby_tag="$1";
rvm_action="${rvm_action:-use}"
shift
;;
+ # For use with --patch
+ --patch-name) rvm_ruby_patch_name="$1" ; shift ;;
+
+ -h|--patch)
+ if [[ -z "$rvm_ruby_patch" ]] ; then
+ rvm_ruby_patch="$1";
+ else
+ rvm_ruby_patch="$rvm_ruby_patch,$1";
+ fi
+ rvm_action="${rvm_action:-use}"
+ shift
+ ;;
+
--head)
if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
rvm_ruby_revision="head"
rvm_head_flag=1
rvm_action="${rvm_action:-use}"
@@ -314,10 +327,12 @@
if [[ -z "$rvm_action" ]] && [[ ! -z "$rvm_ruby_string" ]] ; then rvm_action="use" ; fi
if [[ ! -z "$rvm_parse_break" ]] || [[ ! -z "$rvm_error_message" ]] ; then unset rvm_parse_break; break; fi
done
+ while [[ $# -gt 0 ]] ; do shift ; done
+
if [[ ! -z "$rvm_error_message" ]] ; then __rvm_pushpop ; return 1 ; fi
}
rvm() {
trap '__rvm_cleanup_variables ; rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
@@ -356,12 +371,12 @@
monitor)
export rvm_ruby_version rvm_ruby_string
$rvm_scripts_path/monitor ; result=$?
;;
notes) $rvm_scripts_path/notes ; result=$? ;;
- reload) rvm_reload_flag=1 ; break ;;
- install|uninstall) __rvm_manage_rubies ; result=$? ;;
+ reload) rvm_reload_flag=1 ;;
+ fetch|install|uninstall) __rvm_manage_rubies ; result=$? ;;
tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
iconv|openssl|ncurses|zlib|readline|curl)
__rvm_${rvm_action}_install
result=$?
@@ -386,14 +401,12 @@
__rvm_usage
fi
result=1
esac
-
if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi
if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
return $result
}
-