Bugfix: Separate directory and symlink logic.

scripts/utility

@@ -763,16 +763,24 @@ __rvm_gems_select() {
   # 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
+    # Ensure that the ruby gem home exists.
     mkdir -p "$rvm_ruby_gem_home"
-    if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
+
+    # If there is a cache *directory* already,
+    # move all the gems to the global cache directory and remove it.
+    if [[ -d "$rvm_ruby_gem_home/cache" ]]  ; then
       for file in "$rvm_ruby_gem_home"/cache/* ; do
         mv $file "$rvm_gems_path/cache/" > /dev/null 2>&1
       done
       rm -rf "$rvm_ruby_gem_home/cache"
+    fi
+
+    # If the ruby's gems cache directory is not a symlink to the global cache,
+    # symlink it
+    if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
       ln -nfs "$rvm_gems_path/cache" "$rvm_ruby_gem_home/cache"
     fi
-  fi
-  export rvm_ruby_gem_path rvm_ruby_gem_home
+  fi ; export rvm_ruby_gem_path rvm_ruby_gem_home
 }
 
 # Use a gems(et) specified by 'rvm_ruby_gem_home'