rvm 1.0.7 → 1.0.8

data/scripts/migrate

@@ -5,8 +5,17 @@ unset GREP_OPTIONS
 source "$rvm_path/scripts/base"
 
 usage() {
-  echo "Usage: rvm migrate from to" >&2
-  echo "Moves all gemsets from one ruby to another." >&2
+  printf "
+
+  Usage:
+
+    rvm migrate {source-ruby} {destination-ruby}
+
+  Description:
+
+    Moves all gemsets from {source-ruby} ruby to {destination-ruby}.
+
+" >&2
 }
 
 confirm() {
@@ -43,10 +52,10 @@ migrate_rubies() {
   elif [[ "$expanded_destination" = "$expanded_source" ]]; then
     die_with_error "Source and Destination Ruby are the same ($expanded_destination)"
 
-  elif [[ ! -d "$rvm_rubies_path/$expanded_source" ]]; then
+  elif [[ ! -d "$rvm_path/rubies/$expanded_source" ]]; then
     die_with_error "Ruby '$expanded_source' is not installed - please install it first."
 
-  elif [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
+  elif [[ ! -d "$rvm_path/rubies/$expanded_destination" ]]; then
     die_with_error "Ruby '$expanded_destination' is not installed - please install it first."
   fi
 
@@ -69,15 +78,15 @@ migrate_rubies() {
 
     echo "Moving $origin_gemset to $destination_gemset"
 
-    rm -rf "$rvm_gems_path/$destination_gemset"
+    rm -rf "${rvm_gems_path:-"$rvm_path/gems"}/$destination_gemset"
     result="$?"
 
-    [[ $result -gt 0 ]] && die_with_error "Unable to remove gem directory '$rvm_gems_path/$destination_gemset'" "$result"
+    [[ $result -gt 0 ]] && die_with_error "Unable to remove gem directory '${rvm_gems_path:-"$rvm_path/gems"}/$destination_gemset'" "$result"
 
-    mv "$rvm_gems_path/$origin_gemset" "$rvm_gems_path/$destination_gemset"
+    mv "${rvm_gems_path:-"$rvm_path/gems"}/$origin_gemset" "${rvm_gems_path:-"$rvm_path/gems"}/$destination_gemset"
     result="$?"
 
-    [[ $result -gt 0 ]] && die_with_error "Unable to move '$rvm_gems_path/$origin_gemset' to '$rvm_gems_path/$destination_gemset'" "$result"
+    [[ $result -gt 0 ]] && die_with_error "Unable to move '${rvm_gems_path:-"$rvm_path/gems"}/$origin_gemset' to '${rvm_gems_path:-"$rvm_path/gems"}/$destination_gemset'" "$result"
 
     echo "Making gemset $destination_gemset pristine."
 
@@ -105,19 +114,19 @@ migrate_rubies() {
         "$rvm_path/scripts/alias" create "$migrate_alias_name" "$migrate_new_alias_name" >/dev/null 2>&1
       fi
 
-    done < "$rvm_config_path/alias"
+    done < "$rvm_path/config/alias"
 
   fi
 
   if confirm "Do you wish to move over wrappers?" ; then
 
-    origin_wrappers_path="$rvm_wrappers_path/$expanded_source"
+    origin_wrappers_path="$rvm_path/wrappers/$expanded_source"
 
-    binaries=($(cd "$rvm_bin_path" ; find . -maxdepth 1 -mindepth 1 -type f))
+    binaries=($(cd "${rvm_bin_path:-"$rvm_path/bin"}" ; find . -maxdepth 1 -mindepth 1 -type f))
 
     for binary_name in "${binaries[@]//.\/}" ; do
 
-      full_bin_path="$rvm_bin_path/$binary_name"
+      full_bin_path="${rvm_bin_path:-"$rvm_path/bin"}/$binary_name"
 
       [[ ! -L "$full_bin_path" ]] && continue
 

data/scripts/notes

@@ -32,7 +32,7 @@ dependencies:
   jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
 
 # 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: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
   ruby-head: git subversion autoconf
 
 # For IronRuby (if you wish to use it) you will need:

data/scripts/package

@@ -12,49 +12,67 @@ library="${args[1]:-""}"
 args="$(echo ${args[@]:2})"
 
 install_package() {
+  local result
 
   __rvm_db "${package}_url" "package_url"
 
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
   (
-    builtin cd "$rvm_src_path"
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}"
 
-    "$rvm_path/scripts/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
+    "$rvm_path/scripts/log" "info" "Fetching $package-$version.$archive_format to ${rvm_archives_path:-"$rvm_path/archives"}"
 
     if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
-      "$rvm_path/scripts/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"
+      "$rvm_path/scripts/fetch" \
+        "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+
+      __rvm_run "$package/extract" \
+        "tar zxf ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
 
     elif [[ "$archive_format" = "tar.bz2" ]] ; then
-      "$rvm_path/scripts/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"
+      "$rvm_path/scripts/fetch" \
+        "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+
+      __rvm_run "$package/extract" \
+        "tar jxf ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
 
     elif [[ "$archive_format" = "zip" ]] ; then
-      "$rvm_path/scripts/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"
+      "$rvm_path/scripts/fetch" \
+        "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+
+      __rvm_run "$package/extract" \
+        "unzip -q -o ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -d ${rvm_src_path:-"$rvm_path/src"}/$package-$version" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
 
     else
       printf "\nUnrecognized archive format '$archive_format'" ; return 1
     fi
 
-    builtin cd "$rvm_src_path/$package-$version"
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}/$package-$version"
 
-    __rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+    __rvm_run "$package/configure" \
+      "${configure:-"./configure --prefix=${prefix_path:-"${rvm_usr_path:-"$rvm_path/usr"}"}"} $configure_flags" "Configuring $package in ${rvm_src_path:-"$rvm_path/src"}/$package-$version."
 
     unset configure_flags
 
     if [[ "$action" = "uninstall" ]] ; then
-      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
+      __rvm_run "$package/make.uninstall" \
+        "/usr/bin/make uninstall" "Uninstalling $package from ${rvm_usr_path:-"$rvm_path/usr"}"
 
     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"
+      __rvm_run "$package/make" \
+        "/usr/bin/make $rvm_make_flags" "Compiling $package in ${rvm_src_path:-"$rvm_path/src"}/$package-$version."
+
+      __rvm_run "$package/make.install" \
+        "/usr/bin/make install" "Installing $package to ${rvm_usr_path:-"$rvm_path/usr"}"
     fi
 
-    \touch "$rvm_config_path/packages"
-    "$rvm_path/scripts/db" "$rvm_config_path/packages" "${package}" "${version}"
+    touch "$rvm_path/config/packages"
+    "$rvm_path/scripts/db" "$rvm_path/config/packages" "${package}" "${version}"
   )
+  result=$?
+
+  return $result
 }
 
 readline() {
@@ -119,7 +137,7 @@ openssl() {
   else
     configure_command="./config"
   fi
-  configure="$configure_command $openssl_os -I$rvm_usr_path/include -L$rvm_usr_path/lib --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
+  configure="$configure_command $openssl_os -I${rvm_usr_path:-"$rvm_path/usr"}/include -L${rvm_usr_path:-"$rvm_path/usr"}/lib --prefix=${rvm_usr_path:-"$rvm_path/usr"} zlib no-asm no-krb5 shared"
   install_package
 }
 
@@ -130,7 +148,7 @@ zlib() {
 
 autoconf() {
   package="autoconf" ; version="2.65" ; archive_format="tar.gz"
-  prefix_path="${rvm_bin_path:-"${rvm_path:-"$HOME/.rvm"}"}"
+  prefix_path="${rvm_usr_path:-"$rvm_path/usr"}"
   install_package
 }
 
@@ -153,7 +171,7 @@ gettext() {
 libxml2() {
   package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
-    configure="./configure --prefix=${rvm_usr_path} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+    configure="./configure --prefix=${rvm_usr_path:-"$rvm_path/usr"} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
   fi
   install_package
   unset prefix_path
@@ -163,7 +181,7 @@ glib() {
   pkgconfig
   gettext
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
-  configure="CC=\"cc -L$rvm_usr_path/lib -I$rvm_usr_path/include\" PKG_CONFIG=\"$rvm_usr_path/bin/pkg-config\" ./configure --prefix=$rvm_usr_path"
+  configure="CC=\"cc -L${rvm_usr_path:-"$rvm_path/usr"}/lib -I${rvm_usr_path:-"$rvm_path/usr"}/include\" PKG_CONFIG=\"${rvm_usr_path:-"$rvm_path/usr"}/bin/pkg-config\" ./configure --prefix=${rvm_usr_path:-"$rvm_path/usr"}"
 
   install_package
 }
@@ -180,12 +198,12 @@ llvm() {
   package="llvm" ; version="89156"
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   (
-    builtin cd $rvm_src_path
-    if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
+    builtin cd ${rvm_src_path:-"$rvm_path/src"}
+    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/llvm/.svn" ]] ; then
       __rvm_db "${package}_url" "package_url"
-      \rm -rf "$rvm_src_path/llvm"
+      \rm -rf "${rvm_src_path:-"$rvm_path/src"}/llvm"
       svn co -r "$version" "$package_url" llvm
-      builtin cd "$rvm_src_path/llvm"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}/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

data/scripts/repair

@@ -11,13 +11,19 @@ usage() {
 # related to wrappers.
 repair_symlinks() {
   (
-    builtin cd "$rvm_bin_path"
+    builtin cd "${rvm_bin_path:-"$rvm_path/bin"}"
+
     for executable_name in $(\find \. -type l); do
-      [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_wrappers_path/"* ]] && continue
+
+      [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_path/wrappers/"* ]] && continue
+
       if [[ -f "$executable_name" ]]  ; then
+
         "$rvm_path/scripts/log" "info" \
           "Removing stale symlink from $(basename "$executable_name")"
+
         \rm -f "$executable_name"
+
       fi
     done
   )
@@ -27,16 +33,16 @@ repair_symlinks() {
 repair_environments() {
   local environment_name environments
 
-  environments=($(cd "$rvm_environments_path" ; find . -maxdepth 1 -mindepth 1 -type f))
+  environments=($(cd "$rvm_path/environments" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for environment_name in "${environments[@]//.\/}" ; do
 
-    [[ -L "$rvm_environments_path/$environment_name" ]] && continue
+    [[ -L "$rvm_path/environments/$environment_name" ]] && continue
 
     "$rvm_path/scripts/log" "info" \
       "Regenerating environment file for '$environment_name'"
 
-    [[ -f "$rvm_environments_path/$environment_name" ]] && \rm -f "$rvm_environments_path/$environment_name"
+    [[ -f "$rvm_path/environments/$environment_name" ]] && \rm -f "$rvm_path/environments/$environment_name"
 
     (
     source "$rvm_path/scripts/base"
@@ -54,21 +60,21 @@ repair_archives() {
 
   local archive_file archives stored_md5sum
 
-  archives=($(cd "$rvm_archives_path" ; find . -maxdepth 1 -mindepth 1 -type f))
+  archives=($(cd "${rvm_archives_path:-"$rvm_path/archives"}" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for archive_file in "${archives[@]//.\/}" ; do
 
-    [[ -f "$rvm_archives_path/$archive_file" ]] || continue
+    [[ -f "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" ]] || continue
 
-    stored_md5sum="$($rvm_path/scripts/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
+    stored_md5sum="$($rvm_path/scripts/db "$rvm_path/config/md5" "$archive_file" | head -n1)"
 
     if [[ -n "$stored_md5sum" ]] ; then
 
-      if [[ ! "$rvm_path/scripts/md5" "$rvm_archives_path/$archive_file" "$stored_md5sum" ]] ; then
+      if [[ ! "$rvm_path/scripts/md5" "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" "$stored_md5sum" ]] ; then
 
         "$rvm_path/scripts/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
 
-        rm -rf "$rvm_archives_path/$archive_file"
+        rm -rf "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file"
       fi
     fi
   done

data/scripts/rubygems

@@ -7,8 +7,11 @@ result=0
 __rvm_become
 
 rubygems_setup() {
+
   __rvm_warn_on_rubyopt
+
   unset RUBYOPT
+
   if [[ ! -z "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     install=0
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
@@ -20,14 +23,25 @@ rubygems_setup() {
   fi
 
   if [[ "$install" -eq 0 ]] ; then
-    "$rvm_path/scripts/log" "error" "Cannot switch to ${version} for this interpreter."
+
+    "$rvm_path/scripts/log" "error" \
+      "Cannot switch to ${version} for this interpreter."
+
     exit 1
+
   else
-    "$rvm_path/scripts/log" "info" "Removing old Rubygems files..."
+
+    "$rvm_path/scripts/log" "info" \
+      "Removing old Rubygems files..."
+
     rubygems_dir="$(ruby -rrbconfig -e "puts Config::CONFIG.values_at('sitelibdir','vendorlibdir').detect {|path| File.directory?(File.join(path, 'rubygems')) }.to_s")"
+
     if [[ -n "$rubygems_dir" && -d "$rubygems_dir" ]]; then
+
       # Remove common files installed by ruby gems.
-      \rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
+      \rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" \
+        "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
+
     fi
 
     "$rvm_path/scripts/log" "info" "Installing rubygems dedicated to $rvm_ruby_string..."
@@ -38,28 +52,52 @@ rubygems_setup() {
 
     # Sanity check... If setup.rb is missing from the rubygems source path,
     # something went wrong. Cleanup, aisle 3!
-    if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
-      \rm -rf "$rvm_src_path/$rvm_gem_package_name"
+    if [[ ! -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb" ]]; then
+      \rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
     fi
 
-    if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
-      "$rvm_path/scripts/log" "info" "Retrieving $rvm_gem_package_name"
-      "$rvm_path/scripts/fetch" "$rvm_gem_url"
-      result=$? ; if [[ "$result" -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; return $result
+    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name" ]] ; then
+
+      "$rvm_path/scripts/log" "info" \
+        "Retrieving $rvm_gem_package_name"
+
+      "$rvm_path/scripts/fetch" "$rvm_gem_url" ; result=$?
+
+      if [[ "$result" -gt 0 ]] ; then
+
+        "$rvm_path/scripts/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 ..."
+
+      if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name" ]] ; then
+        \mkdir -p "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
+      fi
+
+      __rvm_run "rubygems.extract" \
+        "gunzip < ${rvm_archives_path:-"$rvm_path/archives"}/$rvm_gem_package_name.tgz | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" \
+        "Extracting $rvm_gem_package_name ..."
     fi
 
-    builtin cd "$rvm_src_path/$rvm_gem_package_name"
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
 
-    __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
+    __rvm_run "rubygems.install" \
+      "GEM_PATH=\"$rvm_ruby_gem_path:$rvm_ruby_global_gems_path\" GEM_HOME=\"$rvm_ruby_gem_home\" BUNDLE_PATH=\"$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby\" \"${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb\"" \
+      "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
+
     if [[ "$result" == 0 ]] ; then
-      "$rvm_path/scripts/log" "info" "Installation of rubygems completed successfully."
+
+      "$rvm_path/scripts/log" "info" \
+        "Installation of rubygems completed successfully."
+
     else
-      "$rvm_path/scripts/log" "warning" "Installation of rubygems did not complete successfully."
+
+      "$rvm_path/scripts/log" "warning" \
+        "Installation of rubygems did not complete successfully."
+
     fi
 
     if [[ ! -z "$rvm_ruby_major_version" ]] ; then
@@ -80,8 +118,12 @@ rubygems_setup() {
 }
 
 if ! command -v ruby > /dev/null ; then
-  "$rvm_path/scripts/log" "error" "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
+
+  "$rvm_path/scripts/log" "error" \
+    "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
+
   exit 1
+
 fi
 
 #
@@ -92,15 +134,23 @@ version="${args[0]}"
 args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
 
 if [[ -z "$version" ]] ; then
-  "$rvm_path/scripts/log" "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
+
+  "$rvm_path/scripts/log" "error" \
+    "A version must be specified, for example 'rvm rubygems 1.3.7'"
+
   exit 1
+
 fi
 
 # Update the rubygems to the current.
 if [[ "$version" = "current" ]]; then
+
   version="$(__rvm_db "${rvm_ruby_interpreter}_rubygems_version")"
+
   version="${rvm_rubygems_version:-"$(__rvm_db "rubygems_version")"}"
+
 fi
+
 rubygems_setup
 
 exit $result

data/scripts/rvm

@@ -5,7 +5,7 @@
 # http://github.com/wayneeseguin/rvm
 
 if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
-  rvm_reload_flag=0
+  unset rvm_reload_flag
 
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
     for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
@@ -39,36 +39,51 @@ if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
 
   # Fix rvm_prefix changes.
   echo "$rvm_prefix" | \grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+
   rvm_prefix_needs_trailing_slash="$?"
+
   if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
+
     rvm_prefix="$rvm_prefix/"
+
   fi
-  unset rvm_prefix_needs_trailing_slash
 
   if [[ -z "$rvm_path" ]] ; then
     rvm_path="${rvm_prefix}rvm"
   fi
 
   if [[ -d "$rvm_path" ]] ; then
+
     for script in array utility initialize version selector cli cd override_gem ; do
+
       if [[ -f "$rvm_path/scripts/$script" ]] ; then
+
         source "$rvm_path/scripts/$script"
+
       else
-        "$rvm_path/scripts/log" "error" "RVM: Could not source script '$rvm_path/scripts/$script', file does not exist. RVM will likely not work as expected."
+
+        "$rvm_path/scripts/log" "error" \
+          "RVM: Could not source script '$rvm_path/scripts/$script', file does not exist. RVM will likely not work as expected."
+
       fi
     done
 
     rvm_loaded_flag=1
 
     rvm_version="$(awk '/:/{printf $NF"."}' "$rvm_path/lib/VERSION.yml")"
+
     export rvm_version="${rvm_version/%.}"
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
     if ! command -v ruby >/dev/null 2>&1 || command -v ruby | \grep -v rvm >/dev/null ; then
-      if [[ -s "$rvm_environments_path/default" ]] ; then
-        source "$rvm_environments_path/default"
+
+      if [[ -s "$rvm_path/environments/default" ]] ; then
+
+        source "$rvm_path/environments/default"
+
       fi
+
     fi
 
     # Makes sure rvm_bin_path is in PATH atleast once.
@@ -77,5 +92,7 @@ if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
   else
     printf "\n\$rvm_path is not set. rvm cannot load."
   fi
+
+  unset rvm_prefix_needs_trailing_slash rvm_bin_path rvm_man_path rvm_rc_files rvm_gems_path rvm_gems_cache_path rvm_selfcontained rvm_interactive_flag rvm_gems_path rvm_project_rvmrc_default rvm_gemset_separator
 fi