scripts/utility in rvm-0.1.5 vs scripts/utility in rvm-0.1.6

@@ -382,11 +382,11 @@
 
   if echo $PATH | grep -q 'rvm\/bin:' ; then
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_tmp_path
+  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gems_path $rvm_tmp_path
 }
 
 # Update rubygems or binscripts based on CLI selection.
 __rvm_update() {
   __rvm_pushpop $rvm_path
@@ -718,11 +718,11 @@
 # Select a gems(et) based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
 __rvm_gems_select() {
   if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
 
-  rvm_ruby_global_gems_path="$rvm_gem_path/$rvm_ruby_string%global"
+  rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string%global"
 
   if [[ -z "$rvm_gem_set_name" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_gemsets=1' in ~/.rvmrc to enable.
     if [[ ! -z "$rvm_sticky_gemsets" ]] ; then
@@ -733,37 +733,39 @@
         rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
       fi
     fi
 
     if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
+      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
     else
       if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
-        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string"
+        rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
       elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
       elif [[ ! -z "$GEM_HOME" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
       else
         unset rvm_ruby_gem_home
       fi
     fi
     if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
+    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
   fi
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
+  # TODO: Remove next line after a few releases.
+  mkdir -p $rvm_gems_path/cache $rvm_gems_path/doc
   # Careful not to nuke system gems cache.
   if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
     # Global gems cache
     mkdir -p "$rvm_ruby_gem_home"
     if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
       for file in "$rvm_ruby_gem_home"/cache/* ; do
-        mv $file "$rvm_gem_path/cache/" > /dev/null 2>&1
+        mv $file "$rvm_gems_path/cache/" > /dev/null 2>&1
       done
       rm -rf "$rvm_ruby_gem_home/cache"
-      ln -nfs "$rvm_gem_path/cache" "$rvm_ruby_gem_home/cache"
+      ln -nfs "$rvm_gems_path/cache" "$rvm_ruby_gem_home/cache"
     fi
   fi
 }
 
 # Use a gems(et) specified by 'rvm_ruby_gem_home'