rvm 1.0.6 → 1.0.7

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 6
+:patch: 7

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2010-09-11}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/alias

@@ -2,7 +2,7 @@
 
 unset rvm_default_flag rvm_wrapper_name
 
-source "$rvm_scripts_path"/base
+source "$rvm_path/scripts/base"
 
 usage() {
   printf "
@@ -26,15 +26,15 @@ alias_conflicts_with_ruby() {
   [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
   # Open for suggestions to a better way of doing this...
   alias_check_result="$(
-    \. \"$rvm_scripts_path/initialize\"
-    \. \"$rvm_scripts_path/selector\"
+    \. \"$rvm_path/scripts/initialize\"
+    \. \"$rvm_path/scripts/selector\"
     export rvm_ruby_string=\"$1\"
     __rvm_ruby_string > /dev/null 2>&1
     echo "$?"
   )"
 
   if [[ "0" == "$alias_check_result" ]]; then
-    "$rvm_scripts_path"/log "error" "\nYou have attempted to create an alias called '$1', which is recognized as a rvm ruby.\n"
+    "$rvm_path/scripts"/log "error" "\nYou have attempted to create an alias called '$1', which is recognized as a rvm ruby.\n"
     return 0
   fi
 
@@ -44,24 +44,27 @@ alias_conflicts_with_ruby() {
 }
 
 alias_show() {
+  local expanded_alias_name
+
   if [[ -z "$alias_name" ]]; then
-    "$rvm_scripts_path"/log "error" "\nusage: 'rvm alias show [alias_name]'\n"
+    "$rvm_path/scripts"/log "error" "\nusage: 'rvm alias show [alias_name]'\n"
     result=1
     return
   fi
-  expanded_alias_name="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"
+
+  expanded_alias_name="$("$rvm_path/scripts"/db "$rvm_config_path/alias" "$alias_name")"
+
   if [[ -z "$expanded_alias_name" ]]; then
-    "$rvm_scripts_path"/log "error" "\nUnknown alias name: '$alias_name'\n"
+    "$rvm_path/scripts"/log "error" "\nUnknown alias name: '$alias_name'\n"
     result=1
   else
     result=0
     if [[ -n "$gemset_name" ]] ; then
-      printf "${expanded_alias_name}${rvm_gemset_separator}${gemset_name}\n"
+      printf "${rvm_gemset_separator:-"@"}${rvm_gemset_separator:-"@"}${gemset_name}\n"
     else
       printf "$expanded_alias_name\n"
     fi
   fi
-  unset expanded_alias_name
 }
 
 alias_delete() {
@@ -70,7 +73,8 @@ alias_delete() {
   for link in "$rvm_rubies_path/$alias_name" ; do
     if [[ -L "$link" ]] ; then rm -f $link ; fi
   done
-  "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "delete"
+
+  "$rvm_path/scripts"/db "$rvm_config_path/alias" "$alias_name" "delete"
 }
 
 alias_create() {
@@ -84,7 +88,7 @@ alias_create() {
   fi
 
   if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
-    "$rvm_scripts_path"/log "error" "\nusage: 'rvm alias [alias_name] [ruby_string]'\n"
+    "$rvm_path/scripts"/log "error" "\nusage: 'rvm alias [alias_name] [ruby_string]'\n"
     result=1
   else
     if [[ -z "$rvm_alias" ]] ; then
@@ -97,21 +101,21 @@ alias_create() {
         rvm_ruby_string="$rvm_environment_identifier"
       fi
       if [[ -z "$rvm_ruby_string" ]]; then
-        "$rvm_scripts_path"/log "error" "\nUnknown ruby string '$rvm_ruby_string' specified\n"
+        "$rvm_path/scripts"/log "error" "\nUnknown ruby string '$rvm_ruby_string' specified\n"
         result=1
         return
       fi
       final_environment_identifier="$(__rvm_environment_identifier)"
-      "$rvm_scripts_path"/log "info" "Creating alias $alias_name for $final_environment_identifier."
+      "$rvm_path/scripts"/log "info" "Creating alias $alias_name for $final_environment_identifier."
       ln -nfs "$rvm_rubies_path/$rvm_ruby_string" "$rvm_rubies_path/$alias_name"
-      "$rvm_scripts_path"/log "info" "Recording alias $alias_name for $final_environment_identifier."
-      "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
+      "$rvm_path/scripts"/log "info" "Recording alias $alias_name for $final_environment_identifier."
+      "$rvm_path/scripts"/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
     else
       if [[ -d "$rvm_rubies_path/$alias_name" ]] ; then
-        "$rvm_scripts_path"/log "error" "\n$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name.\n"
+        "$rvm_path/scripts"/log "error" "\n$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name.\n"
         result=1
       else
-        "$rvm_scripts_path"/log "error" "\n$rvm_rubies_path/$alias_name is already aliased.\n"
+        "$rvm_path/scripts"/log "error" "\n$rvm_rubies_path/$alias_name is already aliased.\n"
         result=1
       fi
     fi
@@ -121,7 +125,7 @@ alias_create() {
 alias_list() {
   for item in $rvm_rubies_path/* ; do
     if [[ -L "$item" ]] ; then
-      echo "$(basename "$item") => $("$rvm_scripts_path"/db "$rvm_config_path/alias" "$(basename "$item")")"
+      echo "$(basename "$item") => $("$rvm_path/scripts"/db "$rvm_config_path/alias" "$(basename "$item")")"
     fi
   done; unset item
 }
@@ -135,15 +139,15 @@ result=0
 
 if [[ ! -f "$rvm_config_path/alias" ]] ; then touch "$rvm_config_path/alias" ; fi
 
-if printf "$alias_name" | grep -q "$rvm_gemset_separator" ; then
-  gemset_name="${alias_name/*${rvm_gemset_separator}/}"
-  alias_name="${alias_name/${rvm_gemset_separator}*/}"
+if printf "$alias_name" | grep -q "${rvm_gemset_separator:-"@"}" ; then
+  gemset_name="${alias_name/*${rvm_gemset_separator:-"@"}/}"
+  alias_name="${alias_name/${rvm_gemset_separator:-"@"}*/}"
 else
   gemset_name=""
 fi
 
 if [[ ! -z "$alias_name" ]] ; then
-  rvm_alias="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"
+  rvm_alias="$("$rvm_path/scripts/db" "$rvm_config_path/alias" "$alias_name")"
 fi
 
 if [[ "$action" = "delete" ]] ; then

data/scripts/base

@@ -7,7 +7,7 @@
 # Use rvm_base_except="" to override the except.
 for script_name in initialize utility selector ; do
   if echo "${rvm_base_except:-""}" | \grep -vq "$script_name" ; then
-    source "$rvm_scripts_path"/$script_name
+    source "$rvm_path/scripts/$script_name"
   fi
 done ; unset script_name rvm_base_except
 

data/scripts/cleanup

@@ -1,25 +1,46 @@
 #!/usr/bin/env bash
 rvm_base_except="selector"
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 usage() {
-  printf "Usage: 'rvm cleanup {all,archives,repos,sources,logs}'\n"
-  printf "       Cleans up the directory tree for the specified item.\n"
-  exit 1
+  printf "
+
+  Usage:
+
+    rvm cleanup {all,archives,repos,sources,logs}
+
+  Description:
+
+    Cleans up the directory tree for the specified item.
+"
+return 0
 }
 
 cleanup() {
+  local cleanup_type current_path
+
   for cleanup_type in $1; do
+
     eval "current_path=\"\$rvm_${cleanup_type}_path\""
+
     if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
-      "$rvm_scripts_path"/log "info" "Cleaning up rvm directory '$current_path'"
+
+      "$rvm_path/scripts/log" "info" \
+        "Cleaning up rvm directory '$current_path'"
+
       rm -rf "$current_path"/* >/dev/null 2>&1
+
     fi
-  done; unset cleanup_type current_path
+
+  done
+
+  return 0
 }
 
 # Exit when there is no argument.
-[[ -z "$1" ]] && usage
+if [[ -z "${1:-""}" ]] ; then
+  usage
+fi
 
 case "$1" in
   all)      cleanup "archives repo src log" ;;
@@ -27,5 +48,8 @@ case "$1" in
   repos)    cleanup "repo" ;;
   sources)  cleanup "src" ;;
   logs)     cleanup "log" ;;
-  *)        usage ;;
+  help)     usage ;;
+  *)        usage ; exit 1;;
 esac
+
+exit $?

data/scripts/cli

@@ -4,7 +4,7 @@ __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 $?
 }
 
@@ -66,7 +66,7 @@ __rvm_parse_args() {
         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
@@ -96,15 +96,15 @@ __rvm_parse_args() {
 
           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
@@ -114,13 +114,15 @@ __rvm_parse_args() {
           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
@@ -220,11 +222,11 @@ __rvm_parse_args() {
             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
@@ -343,7 +345,7 @@ __rvm_parse_args() {
       ;;
 
       --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
       ;;
 
@@ -357,24 +359,6 @@ __rvm_parse_args() {
         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
       ;;
@@ -408,24 +392,21 @@ __rvm_parse_args() {
         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
@@ -433,22 +414,24 @@ __rvm_parse_args() {
           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" ;;
 
@@ -495,10 +478,9 @@ __rvm_parse_args() {
         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
@@ -514,10 +496,12 @@ __rvm_parse_args() {
 
       *)
         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
@@ -533,32 +517,32 @@ __rvm_parse_args() {
               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}"
@@ -569,7 +553,7 @@ __rvm_parse_args() {
             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
@@ -595,14 +579,14 @@ __rvm_parse_args() {
   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
 
@@ -611,7 +595,9 @@ rvm() {
   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.
@@ -620,9 +606,12 @@ rvm() {
 
   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
@@ -635,52 +624,51 @@ rvm() {
 
   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=$? ;;
-
-    list)  "$rvm_scripts_path"/list $rvm_ruby_args ; 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_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
@@ -688,77 +676,78 @@ rvm() {
     ;;
 
     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