rvm 1.0.4 → 1.0.5

data/scripts/notes

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 system="$(uname)"
-item="* "
 
 if [[ "Linux" = "$system" ]] ; then
   for file in /etc/*-release ; do
@@ -9,66 +8,113 @@ if [[ "Linux" = "$system" ]] ; then
   done
   printf "\n\nNotes for ${system} $release\n"
 
-  rvm_aptitude_binary="$(command -v aptitude || comand -v apt-get)"
+  rvm_aptitude_binary="$(command -v aptitude || command -v apt-get)"
   rvm_emerge_binary="$(command -v emerge)"
   rvm_pacman_binary="$(command -v pacman)"
   rvm_yum_binary="$(command -v yum)"
 
-  printf "\n    $item NOTE: MRI stands for Matz's Ruby Interpreter (1.8.X, 1.9.X), ree stands for Ruby Enterprise Edition and rbx stands for Rubinius.\n\n"
-  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"
+  printf "
+# NOTE: MRI stands for Matz's Ruby Interpreter (1.8.X, 1.9.X), ree stands for Ruby Enterprise Edition and rbx stands for Rubinius.
+# curl is required.
+# git is required.
+# patch is required (for ree, some ruby head's).
+# 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.
+# If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print=1' in ~/.rvmrc.
+"
 
   if [[ ! -z "$rvm_aptitude_binary" ]] ; then
-    printf "\n    $item For JRuby (if you wish to use it) you will need:"
-    printf "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"
+    printf "
+dependencies:
+# For RVM
+  rvm: bash curl git-core
 
-    printf "\n    $item For MRI & ree (if you wish to use it) you will need (depending on what you are installing):"
-    printf "\n       $ aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim libsqlite3-0 libsqlite3-dev sqlite3 libreadline-dev libxml2-dev git-core subversion autoconf"
+# For JRuby (if you wish to use it) you will need:
+  jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
 
-    printf "\n    $item For IronRuby (if you wish to use it) you will need:"
-    printf "\n       $ aptitude install curl mono-2.0-devel"
+# For MRI & ree (if you wish to use it) you will need (depending on what you are installing):
+  ruby: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libreadline-dev libxml2-dev git-core
+  ruby-head: git subversion autoconf
+
+# For IronRuby (if you wish to use it) you will need:
+  ironruby: aptitude install curl mono-2.0-devel
+"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    printf "\n    $item For JRuby (if you wish to use it) you will need:"
-    printf "\n       $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+    printf "
+dependencies:
+  # For RVM
+  rvm: bash curl git
+
+  # For MRI based rubies you will need:
+  ruby: # TODO: tell Wayne what goes here :)
+  ruby-head: # TODO: tell Wayne what goes here :)
+
+  # For JRuby (if you wish to use it) you will need:
+  jruby: emerge dev-java/sun-jdk dev-java/sun-jre-bin
 
-    printf "\n    $item For IronRuby (if you wish to use it) you will need:"
-    printf "\n       $ emerge dev-lang/mono"
+  # For IronRuby (if you wish to use it) you will need:
+  ironruby: emerge dev-lang/mono
+    "
 
   elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    printf "\n    $item For MRI based rubies you will need:"
-    printf "\n       $ pacman -Sy autoconf diffutils patch curl bison zlib readline libxml2 git"
+    printf "
+dependencies:
+  # For RVM itself
+  rvm: bash curl git
 
-    printf "\n    $item For JRuby (if you wish to use it) you will need:"
-    printf "\n       $ pacman -Sy jdk jre curl"
+  # For MRI based rubies you will need:
+  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git
+  ruby-head: pacman -Sy --noconfirm subversion autoconf diffutils patch bison
 
-    printf "\n    $item For IronRuby (if you wish to use it) you will need:"
-    printf "\n       $ pacman -Sy mono"
+  # For JRuby (if you wish to use it) you will need:
+  jruby: pacman -Sy --noconfirm jdk jre curl
+
+  # For IronRuby (if you wish to use it) you will need:
+  ironruby: pacman -Sy --noconfirm mono
+"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    printf "\n    $item For MRI/ree (if you wish to use it) you will need:"
-    printf "\n       $ yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel"
-    printf "\n       $ yum install -y iconv-devel # NOTE: For centos 5.4 final iconv-devel might not be available :("
+    printf "
+dependencies:
+  # For RVM
+  rvm: yum install -y bash curl git
+
+  # For MRI/ree (if you wish to use it) you will need:
+  ruby: yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel ; \\
+        yum install -y iconv-devel # NOTE: For centos 5.4 final iconv-devel might not be available :(
 
-    printf "\n    $item For JRuby (if you wish to use it) you will need:"
-    printf "\n       $ yum install -y java"
+  # For JRuby (if you wish to use it) you will need:
+  jruby: yum install -y java
+"
 
   else
-    printf "\n    $item For JRuby (if you wish to use it) you will need:"
-    printf "\n      The SUN java runtime environment and development kit."
-    printf "\n    $item For IronRuby (if you wish to use it) you will need:"
-    printf "\n      The Mono Runtime and Development Platform (version 2.6 or greater is recommended)."
+    printf "
+dependencies:
+  # RVM
+  rvm: bash curl git
+
+  # FOR MRI Ruby, recommended system packages are
+  ruby: # gcc-c++ patch readline zlib libyaml iconv libxml2 libxslt
+
+  # For JRuby (if you wish to use it) you will need:
+  jruby: #The SUN java runtime environment and development kit.
+
+  # For IronRuby (if you wish to use it) you will need:
+  ironruby: #The Mono Runtime and Development Platform (version 2.6 or greater is recommended).
+"
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
+
   release="( $(sw_vers -productName) )"
-  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."
-  printf "\n    $item If you intend on installing JRuby you must install the JDK."
-  printf "\n    $item If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended)."
+
+  printf "
+  Notes for ${system} $release
+    # For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version).
+    # You should download the latest XCode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs.
+    # If you intend on installing MacRuby you must install LLVM first.
+    # If you intend on installing JRuby you must install the JDK.
+    # If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended).
+  "
 fi
 
 echo

data/scripts/package

@@ -17,40 +17,44 @@ install_package() {
 
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
-  __rvm_pushpop "$rvm_src_path"
-
-  "$rvm_scripts_path/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
-
-  if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
-    "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
-    __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
-  elif [[ "$archive_format" = "tar.bz2" ]] ; then
-    "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
-    __rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
-  elif [[ "$archive_format" = "zip" ]] ; then
-    "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
-    __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
-  else
-    printf "\nUnrecognized archive format '$archive_format'" ; return 1
-  fi
+  (
+    builtin cd "$rvm_src_path"
 
-  builtin cd "$rvm_src_path/$package-$version"
+    "$rvm_scripts_path/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
 
-  __rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+    if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
+      "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
 
-  unset configure_flags
+    elif [[ "$archive_format" = "tar.bz2" ]] ; then
+      "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      __rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
 
-  if [[ "$action" = "uninstall" ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
-  else
-    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package in $rvm_src_path/$package-$version."
-    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_usr_path"
-  fi
+    elif [[ "$archive_format" = "zip" ]] ; then
+      "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
 
-  \touch "$rvm_config_path/packages"
-  "$rvm_scripts_path/db" "$rvm_config_path/packages" "${package}" "${version}"
+    else
+      printf "\nUnrecognized archive format '$archive_format'" ; return 1
+    fi
 
-  __rvm_pushpop
+    builtin cd "$rvm_src_path/$package-$version"
+
+    __rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+
+    unset configure_flags
+
+    if [[ "$action" = "uninstall" ]] ; then
+      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
+
+    else
+      __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package in $rvm_src_path/$package-$version."
+      __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_usr_path"
+    fi
+
+    \touch "$rvm_config_path/packages"
+    "$rvm_scripts_path/db" "$rvm_config_path/packages" "${package}" "${version}"
+  )
 }
 
 readline() {
@@ -74,10 +78,13 @@ curl() {
 openssl() {
   package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
+
     if [[ ! -z "$rvm_archflags" ]]; then
+
       if "$rvm_scripts_path/match" "$rvm_archflags" "64"; then
         hw_cpu64bit=1
       fi
+
       if "$rvm_scripts_path/match" "$rvm_archflags" "ppc"; then
         hw_machine="Power Macintosh"
       fi
@@ -85,12 +92,15 @@ openssl() {
       hw_machine=$(sysctl hw.machine | awk -F: '{print $2}' | sed 's/^ //')
       hw_cpu64bit=$(sysctl hw.cpu64bit_capable | awk '{print $2}')
     fi
+
     if [[ "Power Macintosh" = "$hw_machine" ]] ; then
+
       if [[ $hw_cpu64bit = 1 ]]; then
         openssl_os="darwin64-ppc-cc"
       else
         openssl_os="darwin-ppc-cc"
       fi
+
     else
       if [[ $hw_cpu64bit = 1 ]]; then
         openssl_os="darwin64-x86_64-cc"
@@ -167,17 +177,18 @@ mono() {
 llvm() {
   package="llvm" ; version="89156"
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
-  __rvm_pushpop $rvm_src_path
-  if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
-    __rvm_db "${package}_url" "package_url"
-    \rm -rf "$rvm_src_path/llvm"
-    svn co -r "$version" "$package_url" llvm
-    builtin cd "$rvm_src_path/llvm"
-    ./configure --enable-bindings=none
-    UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
-    sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
-  fi
-  __rvm_pushpop
+  (
+    builtin cd $rvm_src_path
+    if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
+      __rvm_db "${package}_url" "package_url"
+      \rm -rf "$rvm_src_path/llvm"
+      svn co -r "$version" "$package_url" llvm
+      builtin cd "$rvm_src_path/llvm"
+      ./configure --enable-bindings=none
+      UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
+      sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
+    fi
+  )
 }
 
 if [[ ! -z "$library" ]] ; then

data/scripts/patches

@@ -6,7 +6,7 @@
 # Returns the path used to look for a patch given a specific name.
 __rvm_patch_lookup_path() {
   echo "/"
-  [[ -n "$rvm_patch_original_pwd" ]] && echo "$rvm_patch_original_pwd/"
+  [[ -n "${rvm_patch_original_pwd:-""}" ]] && echo "$rvm_patch_original_pwd/"
   echo "$PWD/"
   __rvm_ruby_string_paths_under "$rvm_patches_path" | sed 's/$/\//'
 }

data/scripts/repair

@@ -10,15 +10,16 @@ usage() {
 # Removes stale symlinks in $rvm_bin_path, likely
 # related to wrappers.
 repair_symlinks() {
-  __rvm_pushpop "$rvm_bin_path"
-  for executable_name in $(\find \. -type l); do
-    [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_wrappers_path/"* ]] && continue
-    if [[ -f "$executable_name" ]]  ; then
-      "$rvm_scripts_path/log" "info" "Removing stale symlink from $(basename "$executable_name")"
-      \rm -f "$executable_name"
-    fi
-  done; unset executable_name
-  __rvm_pushpop
+  (
+    builtin cd "$rvm_bin_path"
+    for executable_name in $(\find \. -type l); do
+      [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_wrappers_path/"* ]] && continue
+      if [[ -f "$executable_name" ]]  ; then
+        "$rvm_scripts_path/log" "info" "Removing stale symlink from $(basename "$executable_name")"
+        \rm -f "$executable_name"
+      fi
+    done
+  )
 }
 
 # Regenerates each symlink file.

data/scripts/rubygems

@@ -46,7 +46,7 @@ rubygems_setup() {
       "$rvm_scripts_path/log" "info" "Retrieving $rvm_gem_package_name"
       "$rvm_scripts_path/fetch" "$rvm_gem_url"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+        "$rvm_scripts_path/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; return $result
       fi
       \mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "gunzip < $rvm_archives_path/$rvm_gem_package_name.tgz | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
@@ -62,8 +62,8 @@ rubygems_setup() {
       "$rvm_scripts_path/log" "warning" "Installation of rubygems did not complete successfully."
     fi
 
-    if [[ ! -z "$rvm_major_version" ]] ; then
-      ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_release_version}.${rvm_major_version}"
+    if [[ ! -z "$rvm_ruby_major_version" ]] ; then
+      ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_ruby_release_version}.${rvm_ruby_major_version}"
     else
       ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/$interpreter"
     fi

data/scripts/selector

@@ -4,23 +4,14 @@
 __rvm_select() {
 
   # Set Variable Defaults
-  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"
-    [[ -n "$rvm_ruby_revision" ]]    && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_revision"
-    [[ -n "$rvm_ruby_name" ]]        && rvm_ruby_name="$rvm_ruby_string-n$rvm_ruby_name"
+    [[ -n "${rvm_ruby_interpreter:-""}" ]] && 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"
+    [[ -n "${rvm_ruby_revision:-""}" ]]    && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_revision"
+    [[ -n "${rvm_ruby_name:-""}" ]]        && rvm_ruby_name="$rvm_ruby_string-n$rvm_ruby_name"
   fi
 
   __rvm_ruby_string
@@ -33,23 +24,23 @@ __rvm_select() {
 
         rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
 
-        if [[ $rvm_head_flag -eq 1 ]] ; then
+        if [[ ${rvm_head_flag:-0} -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"
+          rvm_ruby_url="$rvm_ruby_repo_url"
 
-        elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
-          __rvm_db "macruby_nightly_url" "rvm_url"
+        elif [[ "nightly" = "${rvm_ruby_version:-""}" ]] ; then
+          __rvm_db "macruby_nightly_url" "rvm_ruby_url"
           rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
           rvm_ruby_package_file="$rvm_ruby_package_name"
 
         else
           __rvm_db "macruby_version" "rvm_ruby_version"
-          __rvm_db "macruby_url" "rvm_url"
+          __rvm_db "macruby_url" "rvm_ruby_url"
           rvm_ruby_package_name="MacRuby%20${rvm_ruby_version}.zip"
           rvm_ruby_package_file="$rvm_ruby_package_name"
-          rvm_url="$rvm_url/$rvm_ruby_package_name"
+          rvm_ruby_url="$rvm_ruby_url/$rvm_ruby_package_name"
         fi
         rvm_ruby_patch_level=""
       else
@@ -63,13 +54,13 @@ __rvm_select() {
       rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
 
-      if [[ $rvm_head_flag -eq 0 ]] ; then
+      if [[ ${rvm_head_flag:-0} -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*#-#')"
         rvm_ruby_package_file="$(echo "rubinius-${rvm_ruby_version}-${rvm_ruby_patch_level}.${rvm_archive_extension}" | sed 's#-p*#-#' )"
-        __rvm_db "rbx_url" "rvm_url"
-        rvm_url="$rvm_url/$rvm_ruby_package_file"
+        __rvm_db "rbx_url" "rvm_ruby_url"
+        rvm_ruby_url="$rvm_ruby_url/$rvm_ruby_package_file"
 
       else
         rvm_ruby_patch_level="" ; rvm_ruby_version=""
@@ -79,10 +70,10 @@ __rvm_select() {
     jruby)
       rvm_ruby_patch_level=""
 
-      if [[ $rvm_head_flag -eq 1 ]] ; then
+      if [[ ${rvm_head_flag:-0} -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")}"
+        rvm_ruby_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
 
       else
         rvm_archive_extension="tar.gz"
@@ -90,7 +81,7 @@ __rvm_select() {
         jruby_url="$(__rvm_db "jruby_url")"
         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"
+        rvm_ruby_url="${jruby_url}/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
         jruby_url=""
       fi
 
@@ -102,10 +93,10 @@ __rvm_select() {
       rvm_ruby_patch_level=""
       maglev_url="$(__rvm_db "maglev_url")"
 
-      if [[ $rvm_head_flag -eq 1 ]] ; then
+      if [[ ${rvm_head_flag:-0} -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")}"
+        rvm_ruby_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
 
       else
         system="$(uname -s)"
@@ -114,7 +105,7 @@ __rvm_select() {
         rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.${system}-${arch}"
         rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "maglev_version")"}"
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        rvm_url="${rvm_ruby_url:-"$maglev_url/${rvm_ruby_package_file}.${rvm_archive_extension}"}"
+        rvm_ruby_url="${rvm_ruby_url:-"$maglev_url/${rvm_ruby_package_file}.${rvm_archive_extension}"}"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
         export MAGLEV_HOME="$rvm_rubies_path/$rvm_ruby_string"
       fi
@@ -127,35 +118,36 @@ __rvm_select() {
         rvm_ruby_version="head"
         rvm_ruby_package_name="${rvm_ruby_string}"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
-        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+        rvm_ruby_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
 
       else
         rvm_archive_extension="zip"
         rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_package_file="${rvm_ruby_interpreter}-${rvm_ruby_version}.${rvm_archive_extension}"
-        rvm_url="$(__rvm_db "ironruby_${rvm_ruby_version}_url")${rvm_ruby_package_file}"
+        rvm_ruby_url="$(__rvm_db "ironruby_${rvm_ruby_version}_url")${rvm_ruby_package_file}"
       fi
 
-      export rvm_ruby_version rvm_ruby_string rvm_ruby_package_name rvm_ruby_repo_url rvm_url rvm_archive_extension
+      export rvm_ruby_version rvm_ruby_string rvm_ruby_package_name rvm_ruby_repo_url rvm_ruby_url rvm_archive_extension
     ;;
 
     ree)
       rvm_ruby_interpreter=ree
       rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
 
-      if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
+      if [[ -n "${rvm_ruby_patch_level:-0}" ]] ; then
         rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
       fi
 
-      if [[ "$rvm_ruby_version" != "head" ]]  ; then
-        if [[ ! -z "$rvm_ruby_revision" ]] ; then
+      if [[ ${rvm_head_flag:-0} -eq 0 ]] ; then
+
+        if [[ -n "${rvm_ruby_revision:-""}" ]] ; then
           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"
-          rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
+          rvm_ruby_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         fi
       fi
 
@@ -170,7 +162,7 @@ __rvm_select() {
       rvm_ruby_string=$(echo $rvm_ruby_string | sed -e 's/shyouhei/mput/g')
       rvm_ruby_patch_level=""
       rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
-      rvm_url=$rvm_ruby_repo_url
+      rvm_ruby_url=$rvm_ruby_repo_url
       rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
     ;;
 
@@ -199,16 +191,16 @@ __rvm_select() {
     ;;
 
     default|system|user)
-      #no-op?
+      # no-op?
     ;;
 
     *)
-      if [[ ! -z "$MY_RUBY_HOME" ]] ; then
+      if [[ -n "${MY_RUBY_HOME:-""}" ]] ; then
         rvm_ruby_string=$(basename $MY_RUBY_HOME)
         __rvm_select
 
       else
-        if [[ -z "$rvm_ruby_string" ]] ; then
+        if [[ -z "${rvm_ruby_string:-""}" ]] ; then
           "$rvm_scripts_path/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
           return 1
         fi
@@ -220,9 +212,9 @@ __rvm_select() {
   if [[ -n "$rvm_ruby_interpreter" && "system" != "$rvm_ruby_interpreter" && "default" != "$rvm_ruby_interpreter" ]] ; then
 
     if [[ ! -z "$rvm_ruby_version" ]] ; then
-      rvm_release_version="${rvm_ruby_version/.*/}"
-      rvm_major_version=${rvm_ruby_version%.*} ; rvm_major_version=${rvm_major_version#*.}
-      rvm_minor_version="${rvm_ruby_version//*.}"
+      rvm_ruby_release_version="${rvm_ruby_version/.*/}"
+      rvm_ruby_major_version=${rvm_ruby_version%.*} ; rvm_ruby_major_version=${rvm_ruby_major_version#*.}
+      rvm_ruby_minor_version="${rvm_ruby_version//*.}"
     fi
 
     rvm_ruby_package_name="${rvm_ruby_package_name:-$(echo $rvm_ruby_string | sed -e 's/-n.*$//')}"
@@ -249,21 +241,18 @@ __rvm_select() {
 
     \mkdir -p "$rvm_ruby_log_path"
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_ruby_release_version rvm_ruby_major_version rvm_ruby_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi
 }
 
 __rvm_use() {
-
-  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:-""}"
@@ -271,9 +260,9 @@ __rvm_use() {
 
   local new_path=""
 
-  if [[ $rvm_ruby_selected_flag -eq 0 ]] ; then __rvm_select "$@" ; fi
+  if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
 
-  if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="system" ; fi
+  if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then rvm_ruby_interpreter="system" ; fi
 
   if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
@@ -304,7 +293,7 @@ __rvm_use() {
       done
     fi
 
-    [[ ${rvm_verbose_flag:-0} -eq 1 ]] && "$rvm_scripts_path/log" "info" "Now using system ruby."
+    [[ ${rvm_verbose_flag:-0} -gt 0 ]] && "$rvm_scripts_path/log" "info" "Now using system ruby."
 
     export rvm_ruby_string="system"
 
@@ -333,7 +322,7 @@ __rvm_use() {
     # Ensure the environment file for the selected ruby exists.
     __rvm_ensure_has_environment_files
 
-    [[ ${rvm_verbose_flag:-0} -eq 1 ]] && \
+    [[ ${rvm_verbose_flag:-0} -gt 0 ]] && \
       "$rvm_scripts_path/log" "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
 
     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")"
@@ -429,9 +418,7 @@ __rvm_ruby_string() {
   fi
 
   # Alias'd rubies
-  if [[ ${rvm_expanding_aliases:-0} -eq 0 ]]; then
-    rvm_ruby_string="${rvm_ruby_string:-"default"}"
-
+  if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""} ]]; 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"
 
@@ -714,7 +701,7 @@ __rvm_gemset_use() {
       fi
     fi
 
-    if [[ ${rvm_interactive_flag:-0} -eq 1 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
+    if [[ ${rvm_interactive_flag:-0} -gt 0 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
       "$rvm_scripts_path/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
@@ -731,9 +718,9 @@ __rvm_gemset_use() {
 }
 
 __rvm_gemset_clear() {
-  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"
+  rvm_gemset_name="" ; shift # TODO: Is this shift necessary???
+  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
   BUNDLE_PATH="$rvm_ruby_gem_home"
   GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"