rvm 1.0.2 → 1.0.3

data/scripts/match

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ -z "$1" ]] || [[ -z "$2" ]] ; then exit 1 ; fi
+if [[ -z "${1:-""}" ]] || [[ -z "${2:-""}" ]] ; then exit 1 ; fi
 
-if [[ -n "$(echo "$1" |  awk "/${2}/")" ]] ; then exit 0 ; else exit 1 ; fi
+if [[ -n "$(echo "${1}" |  awk "/${2}/")" ]] ; then exit 0 ; else exit 1 ; fi
 

data/scripts/md5

@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
-if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-file="$1"
-md5="$2"
+args=($*)
+file="${args[0]}"
+md5="${args[1]}"
+args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
 
 if [[ "Linux" = "$(uname)" ]] ; then
   command="md5sum"

data/scripts/migrate

@@ -7,7 +7,6 @@ source "$rvm_scripts_path/base"
 usage() {
   echo "Usage: rvm migrate from to" >&2
   echo "Moves all gemsets from one ruby to another." >&2
-  exit 1
 }
 
 confirm() {
@@ -106,8 +105,13 @@ migrate_rubies() {
 
 }
 
-if [[ -z "$1" || "$#" != 2 ]]; then
-  usage
+args=($*)
+source_ruby="${args[0]}"
+destination_ruby="${args[1]}"
+args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
+
+if [[ -z "$source_ruby" || -z "$destination_ruby" ]]; then
+  usage ; exit 1
 fi
 
 source_ruby="$1"; shift

data/scripts/notes

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
 system="$(uname)"
-item="$(tput setaf 2)* $(tput sgr0)"
+item="* "
 
 if [[ "Linux" = "$system" ]] ; then
   for file in /etc/*-release ; do
     release="( $(cat $file) )" ; break
   done
-  printf "\n\n$(tput setaf 2)Notes for ${system} $release$(tput sgr0)\n"
+  printf "\n\nNotes for ${system} $release\n"
 
-  rvm_aptitude_binary="$(command -v aptitude)"
+  rvm_aptitude_binary="$(command -v aptitude || comand -v apt-get)"
   rvm_emerge_binary="$(command -v emerge)"
   rvm_pacman_binary="$(command -v pacman)"
   rvm_yum_binary="$(command -v yum)"
@@ -18,6 +18,7 @@ if [[ "Linux" = "$system" ]] ; then
   printf "\n    $item curl is required.\n"
   printf "\n    $item patch is required (for ree, some ruby head's).\n"
   printf "\n    $item If you wish to install rbx and/or any MRI head (eg. 1.9.2-head) then you must install and use rvm 1.8.7 first.\n"
+  printf "\n    $item If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print=1' in ~/.rvmrc.\n"
 
   if [[ ! -z "$rvm_aptitude_binary" ]] ; then
     printf "\n    $item For JRuby (if you wish to use it) you will need:"
@@ -62,7 +63,7 @@ if [[ "Linux" = "$system" ]] ; then
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
   release="( $(sw_vers -productName) )"
-  printf "\n$(tput setaf 2)Notes for ${system} $release $(tput sgr0)\n"
+  printf "\nNotes for ${system} $release\n"
   printf "\n    $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
   printf "\n    $item You should download the latest XCode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs."
   printf "\n    $item If you intend on installing MacRuby you must install LLVM first."

data/scripts/package

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
+
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 rvm_base_except="selector"
 source "$rvm_scripts_path/base"
 
 # Tools to make managing ruby dependencies inside of rvm easier.
-
-action="$1" ; shift
-library="$1" ; shift
-args="$(echo $*) " # Strip trailing / leading / extra spacing.
+args=($*)
+action="${args[0]}"
+library="${args[1]}"
+args="$(echo ${args[@]:2})"
 
 install_package() {
 

data/scripts/patches

@@ -12,12 +12,13 @@ __rvm_patch_lookup_path() {
 }
 
 __rvm_expand_patch_name() {
-  [[ -z "$1" ]] && return
-  expanded_patch_name="$("$rvm_scripts_path/patchsets" show "$1")"
+  local name="$1"
+  [[ -z "$name" ]] && return 0
+  expanded_patch_name="$("$rvm_scripts_path/patchsets" show "$name")"
   if [[ "$?" == "0" ]]; then
-    echo "$expanded_patch_name"
-  elif [[ "$1" != "default" ]]; then
-    echo "$1"
+    echo "${expanded_patch_name}"
+  elif [[ "$name" != "default" ]]; then
+    echo "$name"
   fi ; unset expanded_patch_name
 }
 

data/scripts/patchsets

@@ -34,13 +34,18 @@ __rvm_lookup_full_patch_path() {
 }
 
 usage() {
-  echo "Usage: 'rvm patchset {show,lookup}'"
+  echo "Usage: 'rvm patchset {show,lookup} [patchset]'"
   echo "        Tools for manipulating patchsets."
   return 1
 }
 
-case "$1" in
-  show|lookup) lookup_patchset "$2" ;;
+args=($*)
+action="${args[0]}"
+patchset="${args[1]}"
+args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
+
+case "$action" in
+  show|lookup) lookup_patchset "$patchset" ;;
   *) usage ;;
 esac
 

data/scripts/repair

@@ -50,12 +50,15 @@ repair_all() {
   "$rvm_scripts_path/log" "info" "All items repaired."
 }
 
-if [[ -z "$1" ]]; then
-  usage
-  exit $?
+args=($*)
+action="${args[0]}"
+args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+
+if [[ -z "$action" ]]; then
+  usage ; exit $?
 fi
 
-case "$1" in
+case "$action" in
   all)          repair_all ;;
   symlinks)     repair_symlinks ;;
   environments) repair_environments ;;

data/scripts/rubygems

@@ -87,10 +87,11 @@ fi
 #
 # rvm rubygems use X
 #
-if [[ $# -gt 0 ]] ; then
-  version="$1" ; shift
-  args="$(echo "$@" | __rvm_strip)"
-else
+args=($*)
+version="${args[0]}"
+args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+
+if [[ -z "$version" ]] ; then
   "$rvm_scripts_path/log" "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
   exit 1
 fi

data/scripts/rvm

@@ -4,11 +4,10 @@
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-rvm_reload_flag="${rvm_reload_flag:-0}"
-rvm_loaded_flag="${rvm_loaded_flag:-0}"
-
-if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
-  unset rvm_reload_flag
+rvm_reload_flag=${rvm_reload_flag:-0}
+rvm_loaded_flag=${rvm_loaded_flag:-0}
+if [[ $rvm_loaded_flag -eq 0 || $rvm_reload_flag -eq 1 ]] ; then
+  rvm_reload_flag=0
 
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
     for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
@@ -54,14 +53,13 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
   if [[ -d "$rvm_path" ]] ; then
-    source "$rvm_scripts_path/array"
-    source "$rvm_scripts_path/utility"
-    source "$rvm_scripts_path/initialize"
-    source "$rvm_scripts_path/version"
-    source "$rvm_scripts_path/selector"
-    source "$rvm_scripts_path/cli"
-    source "$rvm_scripts_path/cd"
-    source "$rvm_scripts_path/override_gem"
+    for script in array utility initialize version selector cli cd override_gem ; do
+      if [[ -f "$rvm_scripts_path/$script" ]] ; then
+        source "$rvm_scripts_path/$script"
+      else
+        "$rvm_scripts_path/log" "error" "RVM: Could not source script '$rvm_scripts_path/$script', file does not exist. RVM will likely not work as expected."
+      fi
+    done
 
     rvm_loaded_flag=1
 

data/scripts/rvm-install

@@ -201,7 +201,7 @@ fi
 spinner
 if [[ -d gemsets/ ]] ; then
   \mkdir -p "$rvm_gemsets_path"
-  for gemset_file in $(cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
     destination="$rvm_gemsets_path/$gemset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -214,7 +214,7 @@ fi
 spinner
 if [[ -d patchsets/ ]] ; then
   \mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
+  for patchset_file in $(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
     destination="$rvm_patchsets_path/$patchset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -318,6 +318,7 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
+  printf "\n  * If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print=1' in ~/.rvmrc.\n"
   printf "\n$(tput sgr0)\n"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/scripts/selector

@@ -2,7 +2,17 @@
 
 # __rvm_select implementation version patch_level
 __rvm_select() {
-  if [[ -z "$rvm_ruby_string" ]] ; then
+  rvm_ruby_interpreter=${rvm_ruby_interpreter:-""}
+  rvm_head_flag=${rvm_head_flag:-0}
+  rvm_install_on_use_flag=${rvm_install_on_use_flag:-0}
+  rvm_ruby_version=${rvm_ruby_version:-""}
+  rvm_ruby_patch_level=${rvm_ruby_patch_level:-""}
+  rvm_ruby_revision=${rvm_ruby_revision:-""}
+  rvm_ruby_name=${rvm_ruby_name:-""}
+  rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
+  export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
+
+  if [[ -z "${rvm_ruby_string:-""}" ]] ; then
     rvm_ruby_string="${rvm_ruby_interpreter}"
     [[ -n "$rvm_ruby_version" ]]     && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version"
     [[ -n "$rvm_ruby_patch_level" ]] && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_patch_level"
@@ -18,8 +28,8 @@ __rvm_select() {
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
         rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
-        if [[ "$rvm_head_flag" -eq 1 ]] ; then
-          unset rvm_ruby_version rvm_ruby_tag
+        if [[ $rvm_head_flag -eq 1 ]] ; then
+          rvm_ruby_version="" ; rvm_ruby_tag=""
           rvm_ruby_revision="head"
           __rvm_db "macruby_repo_url" "rvm_ruby_repo_url"
           rvm_url="$rvm_ruby_repo_url"
@@ -34,8 +44,7 @@ __rvm_select() {
           rvm_ruby_package_file="$rvm_ruby_package_name"
           rvm_url="$rvm_url/$rvm_ruby_package_name"
         fi
-
-        unset rvm_ruby_patch_level
+        rvm_ruby_patch_level=""
       else
         "$rvm_scripts_path/log" "fail" "MacRuby can only be installed on a Darwin OS."
       fi
@@ -46,7 +55,7 @@ __rvm_select() {
       rvm_ruby_interpreter="rbx"
       rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
-      if [[ -z "$rvm_head_flag" ]] ; then
+      if [[ $rvm_head_flag -eq 0 ]] ; then
         rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
         rvm_ruby_string="${rvm_ruby_string/-prc/-rc}"
         rvm_ruby_string="$(echo "$rvm_ruby_string" | sed 's#-p*#-#')"
@@ -54,13 +63,13 @@ __rvm_select() {
         __rvm_db "rbx_url" "rvm_url"
         rvm_url="$rvm_url/$rvm_ruby_package_file"
       else
-        unset rvm_ruby_patch_level rvm_ruby_version
+        rvm_ruby_patch_level="" ; rvm_ruby_version=""
       fi
     ;;
 
     jruby)
-      unset rvm_ruby_patch_level
-      if [[ ! -z "$rvm_head_flag" ]] ; then
+      rvm_ruby_patch_level=""
+      if [[ $rvm_head_flag -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
@@ -71,16 +80,16 @@ __rvm_select() {
         rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_url="${jruby_url}/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
-        unset jruby_url
+        jruby_url=""
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
     ;;
 
     maglev)
-      unset rvm_ruby_patch_level
+      rvm_ruby_patch_level=""
       maglev_url="$(__rvm_db "maglev_url")"
-      if [[ ! -z "$rvm_head_flag" ]] ; then
+      if [[ $rvm_head_flag -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
@@ -98,8 +107,8 @@ __rvm_select() {
     ;;
 
     ironruby)
-      unset rvm_ruby_patch_level
-      if [[ "$rvm_head_flag" -eq 1 ]] ; then
+      rvm_ruby_patch_level=""
+      if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_package_name="${rvm_ruby_string}"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
@@ -123,7 +132,7 @@ __rvm_select() {
 
       if [[ "$rvm_ruby_version" != "head" ]]  ; then
         if [[ ! -z "$rvm_ruby_revision" ]] ; then
-          unset rvm_ruby_patch_level rvm_ruby_package_file
+          rvm_ruby_patch_level="" ; rvm_ruby_package_file=""
           rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_revision"
         else
           rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
@@ -140,18 +149,18 @@ __rvm_select() {
       rvm_ruby_interpreter="mput"
       rvm_ruby_version="head"
       rvm_ruby_string=$(echo $rvm_ruby_string | sed -e 's/shyouhei/mput/g')
-      unset rvm_ruby_patch_level
+      rvm_ruby_patch_level=""
       rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
       rvm_url=$rvm_ruby_repo_url
-      unset rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install
+      rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
     ;;
 
     ruby)
-      if [[ -z "$rvm_ruby_version" && -z "$rvm_head_flag" ]]; then
+      if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
         "$rvm_scripts_path/log" "fail" "Unknown ruby version: $rvm_ruby_version"
       else
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
-        if [[ -z "$rvm_head_flag" ]]; then
+        if [[ ${rvm_head_flag:-0} -eq 0 ]]; then
           rvm_archive_extension="tar.bz2"
         fi
       fi
@@ -223,14 +232,28 @@ __rvm_select() {
 
 __rvm_use() {
 
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select "$@" ; fi
+  rvm_ruby_selected_flag=${rvm_ruby_selected_flag:-0}
+  rvm_head_flag=${rvm_head_flag:-0}
+  rvm_default_flag=${rvm_default_flag:-0}
+  rvm_rvmrc_flag=${rvm_rvmrc_flag:-0}
+  rvm_verbose_flag=${rvm_verbose_flag:-0}
+  rvm_sticky_flag=${rvm_sticky_flag:-0}
+  rvm_ruby_interpreter="${rvm_ruby_interpreter:-""}"
+  rvm_gemset_name="${rvm_gemset_name:-""}"
+  rvm_ruby_gem_home="${rvm_ruby_gem_home:-""}"
+  rvm_wrapper_name="${rvm_wrapper_name:-""}"
+  rvm_ruby_alias="${rvm_ruby_alias:-""}"
+
+  local new_path=""
+
+  if [[ $rvm_ruby_selected_flag -eq 0 ]] ; then __rvm_select "$@" ; fi
   if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="system" ; fi
 
   if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
     unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
-    new_path="$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf $PATH)"
+    new_path="$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
     if [[ -s $rvm_config_path/system ]] ; then
       \grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
@@ -241,16 +264,15 @@ __rvm_use() {
     fi
 
     # Check binaries, remove under the condition they're symlinks.
+    local binary full_binary_path
     if [[ "$rvm_selfcontained" = "0" ]] ; then
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
         full_binary_path="$rvm_bin_path/$binary"
         [[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
-      done; unset binary full_binary_path
+      done
     fi
 
-    if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      "$rvm_scripts_path/log" "info" "Now using system ruby."
-    fi
+    [[ ${rvm_verbose_flag:-0} -eq 1 ]] && "$rvm_scripts_path/log" "info" "Now using system ruby."
 
     export rvm_ruby_string="system"
 
@@ -264,11 +286,11 @@ __rvm_use() {
 
     export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
-    if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
+    IRBRC=${IRBRC:-""} ; if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
-    if [[ ! -d $MY_RUBY_HOME ]] ; then
+    if [[ ! -d "$MY_RUBY_HOME" ]] ; then
       "$rvm_scripts_path/log" "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
-      if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
+      if [[ $rvm_install_on_use_flag -eq 1 ]] ; then
         "$rvm_scripts_path/manage" "install" "$rvm_ruby_string"
       else
         "$rvm_scripts_path/log" "info" "To install do: 'rvm install $rvm_ruby_string'"
@@ -279,27 +301,27 @@ __rvm_use() {
     # Ensure the environment file for the selected ruby exists.
     __rvm_ensure_has_environment_files
 
-    if [[ ! -z "$rvm_verbose_flag" ]] ; then
+    [[ ${rvm_verbose_flag:-0} -eq 1 ]] && \
       "$rvm_scripts_path/log" "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
-    fi
 
-    new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf $PATH)"
+    new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
   fi
 
   # Export ruby string and gem set me for extrenal scripts to take advantage of them.
-  if [[ -n "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
-  if [[ -n "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
+  if [[ -n "${rvm_ruby_string:-""}" ]]  ; then export rvm_ruby_string  ; fi
+  if [[ -n "${rvm_gemset_name:-""}" ]]  ; then export rvm_gemset_name ; fi
   if [[ -n "$new_path" ]]; then
     export PATH="$new_path"
     unset new_path
     builtin hash -r
   fi
-  if [[ -n "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
 
-  environment_id="$(__rvm_environment_identifier)"
+  if [[ ${rvm_rvmrc_flag:-0} -eq 1 ]]   ; then __rvm_set_rvmrc ; fi
 
-  if [[ -n "$rvm_default_flag" && "default" != "$rvm_ruby_interpreter" ]] ; then
-    if [[ "$rvm_selfcontained" = "0" ]] ; then
+  local environment_id="$(__rvm_environment_identifier)"
+
+  if [[ ${rvm_default_flag:-0} -eq 1 && "default" != "${rvm_ruby_interpreter:-""}" ]] ; then
+    if [[ "${rvm_selfcontained:-""}" = "0" ]] ; then
       # Sets up the default wrappers.
       "$rvm_scripts_path/wrapper" "$rvm_ruby_string" --no-prefix
     else
@@ -316,26 +338,26 @@ __rvm_use() {
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
       "$rvm_scripts_path/alias" delete default &> /dev/null
       "$rvm_scripts_path/alias" create default "$environment_id" >& /dev/null
-      ln -nfs "$rvm_environments_path/$environment_id" "$rvm_environments_path/default"
-      ln -nfs "$rvm_wrappers_path/$environment_id" "$rvm_wrappers_path/default"
+      \ln -nfs "$rvm_environments_path/$environment_id" "$rvm_environments_path/default"
+      \ln -nfs "$rvm_wrappers_path/$environment_id" "$rvm_wrappers_path/default"
     fi
-  fi ; unset rvm_default_flag
+  fi
+
+  rvm_default_flag=0
 
-  if [[ -n "$rvm_wrapper_name" ]] ; then
+  if [[ -n "${rvm_wrapper_name:-""}" ]] ; then
     "$rvm_scripts_path/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
-    unset rvm_wrapper_name
+    rvm_wrapper_name=""
   fi
 
-  if [[ -n "$rvm_ruby_alias" ]]; then
+  if [[ -n "${rvm_ruby_alias:-""}" ]]; then
     "$rvm_scripts_path/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
     "$rvm_scripts_path/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
     rvm_alias_expanded=1 "$rvm_scripts_path/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
-    unset ruby_alias rvm_ruby_alias
+    ruby_alias="" ; rvm_ruby_alias=""
   fi
 
-  unset environment_id
-
-  if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
+  if [[ "maglev" = "${rvm_ruby_interpreter:-""}" ]] ; then
     export MAGLEV_HOME="$rvm_ruby_home"
     export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
     if [[ -x "$MAGLEV_HOME/gemstone/bin/gslist" ]] ; then
@@ -343,7 +365,10 @@ __rvm_use() {
       if [[ $result -eq 1 ]] ; then "$rvm_ruby_home/bin/maglev" start ; fi
     fi
   fi
+
   rvm_hook="after_use" ; source "$rvm_scripts_path/hook"
+
+  return 0
 }
 
 __rvm_ruby_string() {
@@ -355,83 +380,113 @@ __rvm_ruby_string() {
   # * rvm_ruby_revision
   # * rvm_ruby_tag
 
-  if printf "$rvm_ruby_string" | \grep -q "$rvm_gemset_separator" ; then
-    set_name="${rvm_ruby_string/*${rvm_gemset_separator}/}"
-  else
-    set_name=""
+  rvm_expanding_aliases=${rvm_expanding_aliases:-0}
+
+  rvm_ruby_version=${rvm_ruby_version:-""}
+  rvm_gemset_name=${rvm_gemset_name:-""}
+  rvm_ruby_interpreter=${rvm_ruby_interpreter:-""}
+  rvm_ruby_version=${rvm_ruby_version:-""}
+  rvm_ruby_patch_level=${rvm_ruby_patch_level:-""}
+  rvm_ruby_revision=${rvm_ruby_revision:-""}
+  rvm_ruby_tag=${rvm_ruby_tag:-""}
+
+  if echo "$rvm_ruby_string" | \grep -q "$rvm_gemset_separator" ; then
+    rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator}/}"
+    rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator}*/}"
+    rvm_sticky_flag=1
   fi
-  if [[ -n "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi
 
   # Alias'd rubies
-  if [[ -z "$rvm_expanding_aliases" ]]; then
+  if [[ ${rvm_expanding_aliases:-0} -eq 0 ]]; then
     rvm_ruby_string="${rvm_ruby_string:-"default"}"
-    expanded_alias_name="$($rvm_scripts_path/alias show "$rvm_ruby_string" 2>/dev/null)"
-    if [[ -n "$expanded_alias_name" ]]; then
+
+    if expanded_alias_name="$("$rvm_scripts_path/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
       rvm_ruby_string="$expanded_alias_name"
+
     elif [[ "$rvm_ruby_string" = default ]]; then
       # Default is not a known value. Instead, we need to therefore set it to system.
       rvm_ruby_string="system"
     fi
   fi
+
   ruby_string=${rvm_ruby_string/${rvm_gemset_separator}*/}
 
   __rvm_unset_ruby_variables
 
   for string in $(printf "${ruby_string//-/ }") ; do
+
     if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"
-      unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
+      rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag=""
       export rvm_head_flag=1
+
     elif [[ "system" = "$string" ]] ; then
       rvm_ruby_interpreter="system"
-      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name
-      return
+      rvm_ruby_patch_level="" ; rvm_ruby_tag="" ; rvm_head_flag=0 ; rvm_ruby_revision="" ; rvm_ruby_version="" ; rvm_gemset_name=""
+      return 0
+
     elif [[ "nightly" = "$string" ]] ; then
       rvm_ruby_version="nightly"
       rvm_nightly_flag=1
       break
+
     elif "$rvm_scripts_path/match" "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^rc[0-9]" ; then
       rvm_ruby_patch_level="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^[0-9]\.[0-9]" ; then
       rvm_ruby_version="$string"
-      unset rvm_ruby_revision rvm_ruby_tag
+      rvm_ruby_revision="" ; rvm_ruby_tag=""
+
     elif "$rvm_scripts_path/match" "$string" "^p[0-9]" ; then
       rvm_ruby_patch_level="$string"
-    elif [[ -n "$rvm_ruby_version" ]] && "$rvm_scripts_path/match" "$string" "^[0-9][0-9]" ; then
-      if [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
+
+    elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_scripts_path/match" "$string" "^[0-9][0-9]" ; then
+      if [[ "ree" = "${rvm_ruby_interpreter:-""}" ]] ; then
         rvm_ruby_patch_level="$string"
-        unset rvm_ruby_revision
-      elif [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_ruby_revision=""
+
+      elif [[ "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
         rvm_ruby_patch_level="$string"
-      elif [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_ruby_version="$string"
-        unset rvm_ruby_revision rvm_ruby_patch_level
+
+      elif [[ "maglev" = "${rvm_ruby_interpreter:-""}" ]] ; then
+        rvm_ruby_version="$string" ; rvm_ruby_revision="" ; rvm_ruby_patch_level=""
+
       else
         rvm_ruby_revision="r$string"
       fi
+
     elif "$rvm_scripts_path/match" "$string" "^r[0-9]" ; then
-      unset rvm_ruby_patch_level
+      rvm_ruby_patch_level=""
       rvm_ruby_revision="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^s[0-9]" ; then
-      unset rvm_ruby_revision
+      rvm_ruby_revision=""
       rvm_ruby_sha="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^t[v0-9]" ; then
-      unset rvm_ruby_patch_level rvm_ruby_revision
+      rvm_ruby_patch_level="" ; rvm_ruby_revision=""
       rvm_ruby_tag="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^m[0-9]" ; then
       rvm_ruby_mode="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^u[a-z0-9]" ; then
-      unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag rvm_ruby_patch
+      rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag="" ; rvm_ruby_patch=""
       rvm_ruby_user_tag="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^b[0-9][0-9]" ; then
       rvm_ruby_bits="$string"
+
     elif "$rvm_scripts_path/match" "$string" "^n" ; then
       rvm_ruby_name="${string/n/}"
+
     elif [[ "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby " =~ "$string " ]] ; then
       # NOTE: The space at the end of each of the above strings is *very* important.
       rvm_ruby_interpreter="$string"
+
     else
       "$rvm_scripts_path/log" "error" "Unknown ruby string component: '$string'"
       return 1
@@ -439,51 +494,62 @@ __rvm_ruby_string() {
   done
 
   # Unspecified interpreter
-  if [[ -z "$rvm_ruby_interpreter" ]] ; then
+  if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then
+
     if "$rvm_scripts_path/match" "$rvm_ruby_version" "^1\.[8-9]" ; then
       rvm_ruby_interpreter="ruby"
+
     elif "$rvm_scripts_path/match" "$rvm_ruby_version" "^0.5" ; then
       rvm_ruby_interpreter="macruby"
+
     elif "$rvm_scripts_path/match" "$rvm_ruby_version" "^1.[2-4]" ; then
       rvm_ruby_interpreter="jruby"
     fi
   fi
 
   # Unspecified version
-  if [[ -z "$rvm_ruby_version" ]] && [[ -z "$rvm_head_flag" ]]; then
+  rvm_ruby_version=${rvm_ruby_version:-""}
+  if [[ -z "${rvm_ruby_version:-""}" || ${rvm_head_flag:-0} -eq 0 ]] ; then
     rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
   fi
 
-  if [[ -z "$rvm_ruby_version" ]] ; then
+  if [[ -z "${rvm_ruby_version:-""}" ]] ; then
     rvm_ruby_string="${rvm_ruby_interpreter}"
   else
     rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
   fi
 
   # Head
-  if [[ "$rvm_head_flag" -eq 1 ]] ; then
+  if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
     rvm_ruby_string="${rvm_ruby_string}-head"
-  elif [[ ! -z "$rvm_ruby_revision" ]]  ; then
+
+  elif [[ -n "${rvm_ruby_revision:-""}" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_revision}"
-  elif [[ ! -z "$rvm_ruby_tag" ]]  ; then
+
+  elif [[ -n "${rvm_ruby_tag:-""}" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_tag}"
-  elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
+
+  elif [[ -n "${rvm_ruby_patch_level:-""}" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
-  elif [[ ! -z "$rvm_ruby_user_tag" ]]  ; then
+
+  elif [[ -n "${rvm_ruby_user_tag:-""}" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_user_tag}"
+
   else
     patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
-    if [[ ! -z "$patch_level" ]] ; then
+
+    if [[ -n "${patch_level:-""}" ]] ; then
       if [[ "ree" = "$rvm_ruby_interpreter" ]] || [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
         rvm_ruby_patch_level="${patch_level}"
       else
         rvm_ruby_patch_level="p${patch_level}"
       fi
     fi
-    if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
+
+    if [[ -n "${rvm_ruby_patch_level:-""}" ]] ; then
       rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
-      if [[ "ree" = "$rvm_ruby_interpreter" ]] || [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
+      if [[ "ree" = "${rvm_ruby_interpreter:-""}" ]] || [[ "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-p*#-#')"
       else
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
@@ -492,7 +558,7 @@ __rvm_ruby_string() {
     fi
   fi
 
-  if [[ -n "${rvm_ruby_name}" ]] ; then
+  if [[ -n "${rvm_ruby_name:-""}" ]] ; then
     rvm_ruby_string="${rvm_ruby_string}-n${rvm_ruby_name}"
   fi
 }
@@ -503,63 +569,68 @@ __rvm_gemset_select() {
   command -v gem > /dev/null
   if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
 
+  rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
+  rvm_gemset_name=${rvm_gemset_name:-""}
+
   rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global"
 
-  if [[ -z "$rvm_gemset_name" ]] ; then
+  if [[ -z "${rvm_gemset_name:-""}" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
-    if [[ -n "$rvm_sticky_flag" ]] ; then
-      if [[ -n "$GEM_HOME" ]] ; then
+    if [[ ${rvm_sticky_flag:-0} -eq 1 ]] ; then
+      if [[ -n "${GEM_HOME:-""}" ]] ; then
         rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
       fi
-      if [[ -n "$rvm_ruby_gem_home" ]] ; then
+
+      if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
         rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
       fi
     fi
 
-    if [[ -n "$rvm_gemset_name" ]] && ! "$rvm_scripts_path/match" "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
+    if [[ -n "${rvm_gemset_name:-""}" ]] && ! "$rvm_scripts_path/match" "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
       rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
     else
-      if [[ -n "$rvm_ruby_string" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
+      if [[ -n "${rvm_ruby_string:-""}" ]] && [[ "${rvm_ruby_interpreter:-""}" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
-      elif [[ -z "$GEM_HOME" ]]  && [[ -n "$(command -v gem)" ]] ; then
+      elif [[ -z "${GEM_HOME:-""}" ]]  && [[ -n "$(command -v gem)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
-      elif [[ -n "$GEM_HOME" ]] ; then
+      elif [[ -n "${GEM_HOME:-""}" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
       else
-        unset rvm_ruby_gem_home
+        rvm_ruby_gem_home=""
       fi
     fi
-    if [[ -z "$rvm_gemset_name" ]] ; then unset rvm_gemset_name ; fi
   else
-    gemset=$(echo "$rvm_ruby_gem_home" | awk -F'@' '{print $NF}')
-    if [[ -z "$rvm_ruby_string" ]] && [[ -n "${GEM_HOME/@*/}" ]] ; then
+    local gemset=$(echo "$rvm_ruby_gem_home" | awk -F'@' '{print $NF}')
+    if [[ -z "${rvm_ruby_string:-""}" && -n "${GEM_HOME:-""}" && -n "${GEM_HOME/@*/}" ]] ; then
       rvm_ruby_string=$(basename ${GEM_HOME/@*/})
     fi
 
-    if [[ -n "$rvm_ruby_string" ]] ; then
-      if [[ -z "$rvm_ruby_gem_home" ]] || [[ -n "$gemset" ]] ; then
+    if [[ -n "${rvm_ruby_string:-""}" ]] ; then
+      if [[ -z "${rvm_ruby_gem_home:-""}" || -n "${gemset:-""}" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
-      elif [[ -n "$gemset" ]] && [[ "$rvm_gemset_name" != "$gemset" ]] ; then
+      elif [[ -n "${gemset:-""}" && "${rvm_gemset_name:-""}" != "${gemset:-""}" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
-      fi ; unset gemset
+      fi
     else
       "$rvm_scripts_path/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
       return 1
     fi
   fi
 
+  if [[ -z "${GEM_HOME:-""}" ]] ; then unset GEM_HOME ; fi
+
   # If the gemset does not exist, then notify the user as such and abort the action.
-  if [[ -n "$rvm_gemset_name" ]] && [[ ! -d "$rvm_ruby_gem_home" ]] ; then
-    if [[ "$rvm_gemset_create_on_use_flag" -ne 1 ]] && [[ "$rvm_create_flag" -ne 1 ]] && [[ "$rvm_delete_flag" -ne 1 ]] ; then
+  if [[ -n "${rvm_gemset_name:-""}" && ! -d "$rvm_ruby_gem_home" ]] ; then
+    if [[ ${rvm_gemset_create_on_use_flag:-0} -ne 1 && ${rvm_create_flag:-0} -ne 1 && ${rvm_delete_flag:-0} -ne 1 ]] ; then
       "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
       return 1
     fi
-  elif [[ "$rvm_delete_flag" -eq 1 ]] ; then
+  elif [[ ${rvm_delete_flag:-0} -eq 1 ]] ; then
     return 1
   fi
 
-  if [[ -z "$rvm_ruby_gem_home" ]] && [[ -n $rvm_ruby_string ]] ; then
+  if [[ -z "${rvm_ruby_gem_home:-""}" && -n "${rvm_ruby_string:-""}" ]] ; then
     rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
     rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}global"
   fi
@@ -568,11 +639,11 @@ __rvm_gemset_select() {
 
   # Ensure that the ruby gem home exists.
   \mkdir -p "$rvm_ruby_gem_home"
-  if [[ -n "$rvm_ruby_gem_home" ]] && echo "$rvm_ruby_gem_home" | \grep -q 'rvm'; then
+  if [[ -n "${rvm_ruby_gem_home:-""}" ]] && echo "$rvm_ruby_gem_home" | \grep -q 'rvm'; then
     if __rvm_using_gemset_globalcache && [[ ! -L "$rvm_ruby_gem_home/cache" ]]; then
       mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
       \rm -rf "$rvm_ruby_gem_home/cache"
-      ln -nfs "$rvm_gems_cache_path" "$rvm_ruby_gem_home/cache"
+      \ln -nfs "$rvm_gems_cache_path" "$rvm_ruby_gem_home/cache"
     fi
   fi
 
@@ -581,6 +652,9 @@ __rvm_gemset_select() {
 
 # Use a gemset specified by 'rvm_ruby_gem_home'
 __rvm_gemset_use() {
+  rvm_verbose_flag=${rvm_verbose_flag:-0}
+  rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
+
   if [[ -n "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
       if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then
@@ -591,7 +665,7 @@ __rvm_gemset_use() {
       fi
     fi
 
-    if [[ "$rvm_interactive" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
+    if [[ "$rvm_interactive_flag" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
       "$rvm_scripts_path/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
@@ -603,11 +677,12 @@ __rvm_gemset_use() {
 
     __rvm_use # Now ensure the selection takes effect for the environment.
   fi
+
   return 0
 }
 
 __rvm_gemset_clear() {
-  unset rvm_gemset_name ; shift
+  rvm_gemset_name="" ; shift
   rvm_ruby_gem_home="$(echo "$GEM_HOME" | sed "s#${rvm_gemset_separator:-'@'}.*\$##g")"
   rvm_ruby_global_gems_path="$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global"
   GEM_HOME=$rvm_ruby_gem_home