scripts/cli in rvm-1.0.6 vs scripts/cli in rvm-1.0.7
- old
+ new
@@ -2,11 +2,11 @@
__rvm_usage() { \less "${rvm_path:-$HOME/.rvm}/README" ; }
__rvm_run_script() {
local rvm_script_name="${1:-"$rvm_action"}"
- eval "$rvm_scripts_path/$rvm_script_name $rvm_ruby_args"
+ eval "$rvm_path/scripts/$rvm_script_name $rvm_ruby_args"
return $?
}
__rvm_parse_args() {
# TODO:
@@ -64,11 +64,11 @@
if [[ "rubinius" = "$rvm_token" ]] ; then rvm_token="rbx"; fi
rvm_ruby_interpreter="$rvm_token"
rvm_ruby_string="$rvm_token"
rvm_ruby_strings="$rvm_token"
rvm_action="${rvm_action:-use}"
- if "$rvm_scripts_path"/match "$next_token" "^[0-9]\.[0-9]" ; then
+ if "$rvm_path/scripts"/match "$next_token" "^[0-9]\.[0-9]" ; then
rvm_ruby_version=$next_token
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
fi
;;
@@ -94,35 +94,37 @@
rvm_gemset_name="$next_token"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
if [[ -n "$next_token" ]] ; then rvm_gemset_name="$next_token" ; else rvm_gemset_name="" ; fi
- if echo $rvm_gemset_name | \grep -q $rvm_gemset_separator ; then
- rvm_ruby_string=$(echo $rvm_gemset_name | sed -e 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
- rvm_gemset_name=$(echo $rvm_gemset_name | sed -e 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
+ if echo $rvm_gemset_name | \grep -q ${rvm_gemset_separator:-"@"} ; then
+ rvm_ruby_string=$(echo $rvm_gemset_name | sed -e 's/\(.*\)'"${rvm_gemset_separator:-"@"}"'.*/\1/')
+ rvm_gemset_name=$(echo $rvm_gemset_name | sed -e 's/.*'"${rvm_gemset_separator:-"@"}"'\(.*\)/\1/')
if [[ "${rvm_ruby_string:-""}" != "${rvm_gemset_name:-""}" ]] ; then
- rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
+ rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
fi
- rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
+ rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}$rvm_gemset_name"
fi
elif [[ "delete" = "$next_token" ]] ; then
rvm_delete_flag=1
rvm_ruby_args="$next_token $@"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
rvm_gemset_name="$next_token"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- if echo "$rvm_gemset_name" | \grep -q "$rvm_gemset_separator" ; then
- rvm_ruby_string=$(echo "$rvm_gemset_name" | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
- rvm_gemset_name=$(echo "$rvm_gemset_name" | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
+ if echo "$rvm_gemset_name" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
+ rvm_ruby_string=$(echo "$rvm_gemset_name" | sed 's/\(.*\)'"${rvm_gemset_separator:-"@"}"'.*/\1/')
+ rvm_gemset_name=$(echo "$rvm_gemset_name" | sed 's/.*'"${rvm_gemset_separator:-"@"}"'\(.*\)/\1/')
+
if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
- rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
+ rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
fi
- rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
+
+ rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}$rvm_gemset_name"
fi
else
rvm_gemset_name="${rvm_gemset_name:-""}"
if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ; fi
@@ -218,15 +220,15 @@
else
rvm_ruby_args="$next_token $@"
rvm_parse_break=1
fi
else
- if "$rvm_scripts_path"/match "$next_token" "^-" ; then
+ if "$rvm_path/scripts"/match "$next_token" "^-" ; then
unset rvm_ruby_strings
else
- if "$rvm_scripts_path"/match "$next_token" "^[0-9]" ; then
+ if "$rvm_path/scripts"/match "$next_token" "^[0-9]" ; then
rvm_ruby_strings="${1//,/ }"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
unset rvm_ruby_interpreter
else
@@ -341,11 +343,11 @@
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
fi
;;
--symlink)
- "$rvm_scripts_path/log" "warn" "--symlink has been removed, please see 'rvm wrapper'."
+ "$rvm_path/scripts/log" "warn" "--symlink has been removed, please see 'rvm wrapper'."
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
;;
wrapper)
rvm_action="$rvm_token"
@@ -355,28 +357,10 @@
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
rvm_ruby_args="$next_token $@" # list of binaries, or none
rvm_parse_break=1
;;
- -G)
- path_variable="rvm_gems_path"
- __rvm_set_path_variable "$next_token"
- if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- ;;
-
- --source)
- path_variable="rvm_src_path"
- __rvm_set_path_variable "$next_token"
- if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- ;;
-
- --archives)
- path_variable="rvm_archives_path"
- __rvm_set_path_variable "$next_token"
- if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- ;;
-
-h|--help|usage)
rvm_action=help
;;
--make)
@@ -406,52 +390,51 @@
--archflags)
rvm_archflags="$next_token"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
;;
- --install)
- rvm_install_on_use_flag=1
- ;;
-
--trace|--debug)
local option=""
rvm_debug_flag=1
- for option in verbose errexit noclobber nounset ; do
+ for option in verbose noclobber nounset ; do
set -o $option
done
if [[ -z "${ZSH_VERSION:-""}" ]] ; then
set -o errtrace
- set -o pipefail
fi
+ # errexit pipefail
+
if [[ "$rvm_token" = "--trace" ]] ; then
rvm_trace_flag=1
set -o xtrace
if [[ -z "${ZSH_VERSION:-""}" ]] ; then
- export PS4='+${BASH_SOURCE} : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() : }'
+ export PS4='-[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() > }'
fi
fi
;;
- -q|--quiet) rvm_quiet_flag=1 ;;
- -s|--silent) rvm_silent_flag=1 ;;
-
--proxy)
rvm_proxy="$next_token"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
;;
- --disable-llvm|--disable-jit) rvm_llvm_flag=0 ;;
- --enable-llvm|--enable-jit) rvm_llvm_flag=1 ;;
+ -q|--quiet) rvm_quiet_flag=1 ;;
+ -s|--silent) rvm_silent_flag=1 ;;
+ --disable-llvm|--disable-jit) rvm_llvm_flag=0 ;;
+ --enable-llvm|--enable-jit) rvm_llvm_flag=1 ;;
+ --install) rvm_install_on_use_flag=1 ;;
+ --pretty) rvm_pretty_print_flag=1 ;;
+
reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
--self|--gem|--rubygems|--reconfigure|--default|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--gems|--docs)
export "rvm_${rvm_token//-/}_flag"=1
;;
@@ -493,14 +476,13 @@
rvm_action="error"
rvm_error_message="--configure *must* be followed by configure flags."
fi
;;
- --with-*) rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
- --without-*) rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
- --enable-*) rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
- --disable-*) rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
+ --with-*|--without-*|--enable-*|--disable-*)
+ rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token"
+ ;;
-I|--include)
if [[ -z "$next_token" ]] ; then
rvm_action="error"
rvm_error_message="-I|--include *must* be followed by a path."
@@ -512,14 +494,16 @@
--) rvm_ruby_args="$next_token $*" ; rvm_parse_break=1 ;;
*)
if [[ -n "$rvm_token" ]] ; then
+
+
if [[ "gemset" = "$rvm_action" ]] ; then
- if "$rvm_scripts_path/match" "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
- rvm_gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
- rvm_ruby_string="${rvm_token/${rvm_gemset_separator}*/}"
+ if "$rvm_path/scripts/match" "$rvm_token" "^.+${rvm_gemset_separator:-"@"}.+$" ; then
+ rvm_gemset_name="${rvm_token/*${rvm_gemset_separator:-"@"}/}"
+ rvm_ruby_string="${rvm_token/${rvm_gemset_separator:-"@"}*/}"
elif echo "$rvm_token" | \grep -q '.gems$' ; then
rvm_file_name="${rvm_token/.gems/}.gems" # Account for possible .gems.gems
# elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
else
@@ -531,47 +515,47 @@
rvm_ruby_strings="$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
- elif "$rvm_scripts_path/match" "$rvm_token" "^${rvm_gemset_separator}" ; then
+ elif "$rvm_path/scripts/match" "$rvm_token" "^${rvm_gemset_separator:-"@"}" ; then
rvm_action="${rvm_action:-use}"
- rvm_gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
+ rvm_gemset_name="${rvm_token/*${rvm_gemset_separator:-"@"}/}"
rvm_ruby_string="${rvm_ruby_string:-""}"
- rvm_ruby_strings="${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+ rvm_ruby_strings="${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
- elif "$rvm_scripts_path/match" "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
- gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
+ elif "$rvm_path/scripts/match" "$rvm_token" "^.+${rvm_gemset_separator:-"@"}.+$" ; then
+ gemset_name="${rvm_token/*${rvm_gemset_separator:-"@"}/}"
rvm_ruby_string="$rvm_token"
rvm_ruby_strings="$rvm_token"
- elif "$rvm_scripts_path/match" "$rvm_token" "^.+\\+.+$" ; then
+ elif "$rvm_path/scripts/match" "$rvm_token" "^.+\\+.+$" ; then
rvm_ruby_alias="${rvm_token/*+/}"
rvm_ruby_string="${rvm_token/+*/}"
rvm_ruby_strings="$rvm_ruby_string"
- elif "$rvm_scripts_path/match" "$rvm_token" "-" ; then
+ elif "$rvm_path/scripts/match" "$rvm_token" "-" ; then
rvm_ruby_string="$rvm_token"
rvm_ruby_strings="$rvm_token"
- elif "$rvm_scripts_path/match" "$rvm_token" "^[0-9].[0-9]" ; then
+ elif "$rvm_path/scripts/match" "$rvm_token" "^[0-9].[0-9]" ; then
rvm_ruby_string="$rvm_token"
rvm_ruby_strings="$rvm_token"
rvm_action="${rvm_action:-use}"
- elif "$rvm_scripts_path/match" "$rvm_token" "^ree-" ; then
+ elif "$rvm_path/scripts/match" "$rvm_token" "^ree-" ; then
rvm_ruby_string="$rvm_token"
rvm_ruby_strings="$rvm_token"
rvm_action="${rvm_action:-use}"
elif [[ -L "$rvm_rubies_path/$rvm_token" ]] ; then # Alias
rvm_ruby_string=$rvm_token
rvm_ruby_strings="$rvm_token"
rvm_action="${rvm_action:-use}"
else
- if "$rvm_scripts_path/match" "$rvm_token" ".rb$" ; then # we have a specified ruby script
+ if "$rvm_path/scripts/match" "$rvm_token" ".rb$" ; 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" ; fi
else
rvm_action="error"
@@ -593,38 +577,43 @@
# Empty args list.
while [[ $# -gt 0 ]] ; do shift ; done
if [[ -n "${rvm_error_message:-""}" ]] ; then
- "$rvm_scripts_path"/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+ "$rvm_path/scripts"/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
return 1
fi
}
rvm() {
- local next_token
+ local next_token result
__rvm_setup
case $- in *i*) rvm_interactive_flag=1 ;;
*) rvm_interactive_flag=0 ;;
esac ; export rvm_interactive_flag
if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+
trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
+
fi
# Check that this is the current version.
disk_version="$(awk '/:/{printf $NF"."}' "$rvm_path/lib/VERSION.yml")"
disk_version="${disk_version/%.}"
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- if [[ "${rvm_version}" != "${disk_version}" && "reload" != "$next_token" ]]; then
+ if [[ "${rvm_version:-""}" != "${disk_version:-""}" && "reload" != "${next_token:-""}" ]] ; then
+
printf "\nA RVM version ${disk_version} is installed yet ${rvm_version} is loaded.\n Please do one of the following:\n * 'rvm reload'\n * open a new shell\n * source your shell init scripts"
+
return 1
+
fi
__rvm_cleanse_variables
__rvm_load_rvmrc
@@ -633,133 +622,133 @@
__rvm_parse_args "$@"
rvm_action="${rvm_action:-usage}"
- export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_ruby_aliases rvm_quiet_flag rvm_silent_flag
+ export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments rvm_path rvm_rubies_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_ruby_aliases rvm_quiet_flag rvm_silent_flag rvm_pretty_print_flag
result=0
case "$rvm_action" in
- use) __rvm_use ; result=$? ;;
- srcdir) __rvm_source_dir ; result=$? ;;
- strings) __rvm_strings ; result=$? ;;
- version) __rvm_version ; result=$? ;;
- reset) __rvm_reset ; result=$? ;;
- update) __rvm_update ; result=$? ;;
- reboot) __rvm_reboot ; result=$? ;;
- usage) __rvm_usage ; result=$? ;;
- benchmark) __rvm_benchmark ; result=$? ;;
- inspect) __rvm_inspect ; result=$? ;;
- implode|seppuku) __rvm_implode ; result=$? ;;
+ use) __rvm_use ;;
+ srcdir) __rvm_source_dir ;;
+ strings) __rvm_strings ;;
+ version) __rvm_version ;;
+ reset) __rvm_reset ;;
+ update) __rvm_update ;;
+ reboot) __rvm_reboot ;;
+ usage) __rvm_usage ;;
+ benchmark) __rvm_benchmark ;;
+ inspect) __rvm_inspect ;;
+ implode|seppuku) __rvm_implode ;;
- list) "$rvm_scripts_path"/list $rvm_ruby_args ; result=$? ;;
+ list) "$rvm_path/scripts"/list $rvm_ruby_args ;;
# TODO: Make debug run in the current environment.
- debug) "$rvm_scripts_path/info" '' debug ; result=$? ;;
- help) "$rvm_scripts_path/help" $rvm_ruby_args ; result=$? ;;
- env) "$rvm_scripts_path/env" "$rvm_ruby_string" ; result=$? ;;
+ debug) "$rvm_path/scripts/info" '' debug ;;
+ help) "$rvm_path/scripts/help" $rvm_ruby_args ;;
+ env) "$rvm_path/scripts/env" "$rvm_ruby_string" ;;
info)
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
if [[ "$next_token" = "info" ]]; then shift; fi
- "$rvm_scripts_path/info" $rvm_ruby_args
- result=$?
+ "$rvm_path/scripts/info" $rvm_ruby_args
;;
answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
question) __rvm_ultimate_question ; result=42 ;;
wrapper)
- "$rvm_scripts_path/wrapper" "$rvm_ruby_string" "$rvm_wrapper_name" $rvm_ruby_args
- result=$? ; unset rvm_wrapper_name
+ "$rvm_path/scripts/wrapper" "$rvm_ruby_string" "$rvm_wrapper_name" $rvm_ruby_args
+ unset rvm_wrapper_name
;;
gemdir|gemhome|gempath)
- "$rvm_scripts_path/gemsets" "$rvm_action" ; result=$?
+ "$rvm_path/scripts/gemsets" "$rvm_action"
;;
ruby|gem|rake|exec)
old_rvm_ruby_string=$rvm_ruby_string
unset rvm_ruby_string
export rvm_ruby_strings
- "$rvm_scripts_path/set" "$rvm_action" $rvm_ruby_args
+ "$rvm_path/scripts/set" "$rvm_action" $rvm_ruby_args
result=$?
# Restore the state pre-sets.
[[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
unset old_rvm_ruby_string
;;
cleanup|tools|snapshot|disk-usage|repair|alias|docs|rubygems|migrate|upgrade)
- __rvm_run_script "$rvm_action" ; result=$?
+ __rvm_run_script "$rvm_action"
;;
- rvmrc) eval "__rvm_rvmrc_tools $rvm_ruby_args" ; result=$? ;;
+ rvmrc) eval "__rvm_rvmrc_tools $rvm_ruby_args" ;;
gemset)
- #if "$rvm_scripts_path/match" $rvm_ruby_args use ; then
+ #if "$rvm_path/scripts/match" $rvm_ruby_args use ; then
if [[ ${rvm_use_flag:-0} -eq 1 ]] ; then
- __rvm_gemset_select
- result=$? ; if [[ $result -eq 0 ]] ; then
- __rvm_gemset_use
- fi
+ __rvm_gemset_select && __rvm_gemset_use
else
export rvm_ruby_strings
- "$rvm_scripts_path/gemsets" $rvm_ruby_args ; result=$?
+ "$rvm_path/scripts/gemsets" $rvm_ruby_args ; result=$?
rvm_ruby_strings=""
# Clear the gemset.
if [[ ${rvm_delete_flag:-0} -eq 1 ]] ; then
- gem_prefix="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator}'.*$//')"
+ gem_prefix="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')"
- if [[ "${GEM_HOME:-""}" = "${gem_prefix}${rvm_gemset_separator}${rvm_gemset_name}" ]] ; then
+ if [[ -n "${GEM_HOME:-""}" && "$GEM_HOME" = "${gem_prefix}${rvm_gemset_separator:-"@"}${rvm_gemset_name}" ]] ; then
rvm_ruby_gem_home="$gem_prefix"
GEM_HOME="$rvm_ruby_gem_home"
BUNDLE_PATH="$rvm_ruby_gem_home"
- GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home${rvm_gemset_separator}global/bin"
+ GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}global/bin"
export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
- fi ; unset gem_prefix
+ fi
+ unset gem_prefix
fi
fi
- result=$?
;;
monitor)
export rvm_ruby_strings rvm_ruby_string
- "$rvm_scripts_path"/monitor ; result=$?
+ "$rvm_path/scripts/monitor"
;;
- notes) "$rvm_scripts_path/notes" ; result=$? ;;
- reload) rvm_loaded_flag=0 ; rvm_reload_flag=1 ;;
- tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
- package) "$rvm_scripts_path/package" $rvm_ruby_args ; result=$? ;;
+ notes) "$rvm_path/scripts/notes" ;;
+ reload) rvm_reload_flag=1 ;;
+ tests|specs) rvm_action="rake" ; __rvm_do ;;
+ package) "$rvm_path/scripts/package" $rvm_ruby_args ;;
fetch|install|uninstall|remove)
if [[ -n "$rvm_ruby_strings" ]]; then
- "$rvm_scripts_path"/manage "$rvm_action" "$rvm_ruby_strings"
+ "$rvm_path/scripts"/manage "$rvm_action" "$rvm_ruby_strings"
else
- "$rvm_scripts_path"/manage "$rvm_action"
+ "$rvm_path/scripts"/manage "$rvm_action"
fi
- result=$?
;;
- error)
- result=1
- ;;
+ error) false ;;
*)
if [[ -n "${rvm_action:-""}" ]] ; then
- "$rvm_scripts_path/log" "fail" "unknown action '$rvm_action'"
+ "$rvm_path/scripts/log" "fail" "unknown action '$rvm_action'"
else
__rvm_usage
fi
- result=1
+ false # result
esac
+ result=${result:-$?}
+
if [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
- source "$rvm_scripts_path/rvm"
+
+ rvm_loaded_flag=0
+
+ source "$rvm_path/scripts/rvm"
+
# Note: Not using builtin on purpose. Done so we can trigger a reload the rvmrc.
__rvm_project_rvmrc
+
fi
__rvm_teardown
if [[ ${rvm_trace_flag:-0} -eq 1 ]] ; then