rvm 1.0.8 → 1.0.9

data/binscripts/rvm

@@ -1,42 +1,66 @@
 #!/usr/bin/env bash
 
 if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; then
+
   for rvmrc in /etc/rvmrc "$HOME/.rvmrc" ; do
+
     if [[ -f "$rvmrc" ]] ; then
+
       if grep -q '^\s*rvm .*$' "$rvmrc" ; then
+
         printf "\n  Error:
     $rvmrc is for rvm settings only.
     rvm CLI may NOT be called from within $rvmrc.
     Skipping the loading of $rvmrc
 "
         exit 1
+
       else
+
         source "$rvmrc"
+
       fi
+
     fi
+
   done
+
 fi
 
 # Setup default sandbox value. See scripts/rvm for origin.
 if [[ ${rvm_selfcontained:-0} -eq 0 ]]; then
+
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+
     rvm_selfcontained=0
+
   else
+
     rvm_selfcontained=1
+
   fi
+
 fi
 
 if [[ -z "${rvm_prefix:-""}" ]] ; then
+
   if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
+
     rvm_prefix="/usr/local/"
+
   else
+
     rvm_prefix="$HOME/."
+
   fi
+
 fi
 
 # 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

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 8
+:patch: 9

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-15}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/alias

@@ -78,45 +78,84 @@ alias_delete() {
 }
 
 alias_create() {
-  rvm_environment_identifier="${rvm_environment_identifier:-""}"
+
   alias_name="${alias_name:-""}"
+
   rvm_ruby_string="${rvm_ruby_string:-""}"
 
-  if alias_conflicts_with_ruby "$alias_name"; then
+  if [[ "default" != "$alias_name" ]] && alias_conflicts_with_ruby "$alias_name"; then
     # Force it to an empty alias name to trigger the usage.
     alias_name=""
   fi
 
-  if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
-    "$rvm_path/scripts"/log "error" "\nusage: 'rvm alias [alias_name] [ruby_string]'\n"
+  if [[ -z "${rvm_environment_identifier:-""}" || -z "$alias_name" ]] ; then
+
+    "$rvm_path/scripts"/log "error" \
+      "\nusage: 'rvm alias [alias_name] [ruby_string]'\n"
+
     result=1
   else
+
+    if [[ "default" = "$alias_name" ]] ; then
+      rvm_alias=""
+    fi
+
     if [[ -z "$rvm_alias" ]] ; then
+
       rvm_ruby_string="$rvm_environment_identifier"
+
       if [[ -z "$rvm_alias_expanded" ]]; then
+
         rvm_expanding_aliases=1
+
         __rvm_become
+
         unset rvm_expanding_aliases
+
       else
+
         rvm_ruby_string="$rvm_environment_identifier"
+
       fi
+
       if [[ -z "$rvm_ruby_string" ]]; then
-        "$rvm_path/scripts"/log "error" "\nUnknown ruby string '$rvm_ruby_string' specified\n"
+
+        "$rvm_path/scripts"/log "error" \
+          "\nUnknown ruby string '$rvm_ruby_string' specified\n"
+
         result=1
-        return
+
+        return $result
       fi
-      final_environment_identifier="$(__rvm_environment_identifier)"
-      "$rvm_path/scripts"/log "info" "Creating alias $alias_name for $final_environment_identifier."
+
+      final_environment_identifier="${rvm_environment_identifier:-$(__rvm_environment_identifier)}"
+
+      "$rvm_path/scripts"/log "info" \
+        "Creating alias $alias_name for $final_environment_identifier."
+
       ln -nfs "$rvm_path/rubies/$rvm_ruby_string" "$rvm_path/rubies/$alias_name"
-      "$rvm_path/scripts"/log "info" "Recording alias $alias_name for $final_environment_identifier."
+
+      "$rvm_path/scripts"/log "info" \
+        "Recording alias $alias_name for $final_environment_identifier."
+
       "$rvm_path/scripts"/db "$rvm_path/config/alias" "$alias_name" "$final_environment_identifier"
+
     else
+
       if [[ -d "$rvm_path/rubies/$alias_name" ]] ; then
-        "$rvm_path/scripts"/log "error" "\n$rvm_path/rubies/$alias_name is taken and is *not* able to be an alias name.\n"
+
+        "$rvm_path/scripts"/log "error" \
+          "\n$rvm_path/rubies/$alias_name is taken and is *not* able to be an alias name.\n"
+
         result=1
+
       else
-        "$rvm_path/scripts"/log "error" "\n$rvm_path/rubies/$alias_name is already aliased.\n"
+
+        "$rvm_path/scripts"/log "error" \
+          "\n$rvm_path/rubies/$alias_name is already aliased.\n"
+
         result=1
+
       fi
     fi
   fi
@@ -124,15 +163,13 @@ alias_create() {
 
 alias_list() {
 
-  local item
+  local item items
 
-  for item in "$rvm_path/rubies/"* ; do
+  items=($(cd "$rvm_path/rubies" ; find . -maxdepth 1 -mindepth 1 -type l | sed -e 's#./##'))
 
-    if [[ -L "$item" ]] ; then
+  for item in "${items[@]}" ; do
 
-      echo "$(basename "$item") => $("$rvm_path/scripts"/db "$rvm_path/config/alias" "$(basename "$item")")"
-
-    fi
+    echo "$(basename "$item") => $("$rvm_path/scripts"/db "$rvm_path/config/alias" "$(basename "$item")")"
 
   done
 
@@ -154,21 +191,33 @@ else
   gemset_name=""
 fi
 
-if [[ ! -z "$alias_name" ]] ; then
+if [[ -n "$alias_name" ]] ; then
   rvm_alias="$("$rvm_path/scripts/db" "$rvm_path/config/alias" "$alias_name")"
 fi
 
 if [[ "$action" = "delete" ]] ; then
+
   alias_delete
+
 elif [[ "$action" = "create" ]] ; then
+
   alias_create
+
 elif [[ "$action" = "list" ]] ; then
+
   alias_list
+
 elif [[ "$action" = "show" ]]; then
+
   alias_show
+
+
 elif [[ "$action" = "help" ]]; then
+
   usage
+
 else
+
   usage
   exit 1
 fi

data/scripts/base

@@ -6,10 +6,17 @@
 # Load the general scripts.
 # Use rvm_base_except="" to override the except.
 for script_name in initialize utility selector ; do
+
   if echo "${rvm_base_except:-""}" | \grep -vq "$script_name" ; then
+
     source "$rvm_path/scripts/$script_name"
+
   fi
-done ; unset script_name rvm_base_except
+
+done
+
+unset script_name rvm_base_except
+
 
   #for option in errexit noclobber nounset ; do
   #  set -o $option
@@ -31,5 +38,8 @@ else
   __array_start=0
 fi
 
+export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_alias_expanded rvm_archflags rvm_archive_extension rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_default_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_expanding_aliases rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_gemstone_package_file rvm_gemstone_url rvm_head_flag rvm_hook rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_nightly_flag rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_binary rvm_ruby_bits rvm_ruby_configure rvm_ruby_file rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_global_gems_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_load_path rvm_ruby_major_version rvm_ruby_make rvm_ruby_make_install rvm_ruby_minor_version rvm_ruby_mode rvm_ruby_name rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_patch rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_require rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_sha rvm_ruby_string rvm_ruby_strings rvm_ruby_tag rvm_ruby_url rvm_ruby_user_tag rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_sticky_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
+
+
 # Cleanup tmp on exit.
 trap "__rvm_cleanup_temp_for '$$'" 0 1 2 3 15

data/scripts/cli

@@ -84,7 +84,7 @@ __rvm_parse_args() {
       gemset)
         rvm_action=$rvm_token
 
-        rvm_ruby_gem_home="$GEM_HOME"
+        rvm_ruby_gem_home="${GEM_HOME:-""}"
 
         if [[ -z "$next_token" ]] ; then
           rvm_ruby_args="help"
@@ -397,25 +397,24 @@ __rvm_parse_args() {
       ;;
 
       --trace|--debug)
-        local option=""
+        local option
 
         export rvm_debug_flag=1
 
-        for option in verbose noclobber nounset ; do
-          set -o $option
-        done
+        set -o verbose
+        set -o noclobber
+        set -o nounset
 
         if [[ -z "${ZSH_VERSION:-""}" ]] ; then
           set -o errtrace
         fi
 
         # errexit pipefail
-
         if [[ "$rvm_token" = "--trace" ]] ; then
 
           export rvm_trace_flag=1
 
-          set -o xtrace
+          #set -o xtrace
 
           if [[ -z "${ZSH_VERSION:-""}" ]] ; then
             export PS4='-[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() > }'
@@ -423,7 +422,6 @@ __rvm_parse_args() {
         fi
       ;;
 
-
       --proxy)
         rvm_proxy="$next_token"
         if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
@@ -579,8 +577,6 @@ __rvm_parse_args() {
     if [[ ${rvm_parse_break:-0} -eq 1 || -n "${rvm_error_message:-""}" ]] ; then break ; fi
   done
 
-  export rvm_head_flag $(env | awk -F= -v ORS=' ' '/^rvm_/{print $1}')
-
   # Empty args list.
   while [[ $# -gt 0 ]] ; do shift ; done
 
@@ -632,7 +628,7 @@ rvm() {
 
   result=0
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH $(env | awk -F= -v ORS=' ' '/^rvm_/{print $1}')
+  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
 
   case "$rvm_action" in
     use)             __rvm_use        ;;
@@ -704,7 +700,7 @@ rvm() {
         if [[ ${rvm_delete_flag:-0} -eq 1 ]] ; then
           gem_prefix="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')"
 
-          if [[ -n "${GEM_HOME:-""}" && "$GEM_HOME" = "${gem_prefix}${rvm_gemset_separator:-"@"}${rvm_gemset_name}" ]] ; then
+          if [[ "${GEM_HOME:-""}" = "${gem_prefix}${rvm_gemset_separator:-"@"}${rvm_gemset_name}" ]] ; then
             rvm_ruby_gem_home="$gem_prefix"
             GEM_HOME="$rvm_ruby_gem_home"
             BUNDLE_PATH="$rvm_ruby_gem_home"
@@ -765,6 +761,6 @@ rvm() {
     rvm_trace_flag=0
   fi
 
-  return $result
+  return ${result:-0}
 }
 

data/scripts/db

@@ -1,41 +1,86 @@
 #!/usr/bin/env bash
 
 usage() {
-  printf "\nUsage:\n" >&2
-  printf "\n  $rvm_path/scripts/db database_file {{key}} {{value}} # set" >&2
-  printf "\n  $rvm_path/scripts/db database_file {{key}} # get" >&2
-  printf "\n  $rvm_path/scripts/db database_file {{key}} unset # unset\n\n" >&2
+  printf "
+
+  Usage:
+
+    db database_file {{key}} {{value}} # set
+    db database_file {{key}}           # get
+    db database_file {{key}} unset     # unset
+
+" >&2
 }
 
 if [[ -f "$1" ]] ; then
+
   database_file="$1" ; shift
+
   if [[ ! -f "$database_file" ]] ; then
-    \mkdir -p $(dirname $database_file)
-    \touch $database_file
+
+    directory=$(dirname "$database_file")
+
+    if [[ ! -d "$directory" ]] ; then
+      mkdir -p "$directory"
+    fi
+
+    touch "$database_file"
+
   fi
+
 else
+
   printf "\n\nDatabase file $1 does not exist.\n\n" >&2
+
   exit 1
+
 fi
 
 key="$1" ; shift
+
 if [[ -z "$key" ]] ; then
+
   usage
+
   exit 1
+
 else
+
   value="$*"
-  if [[ "unset" = "$value" ]] || [[ "delete" = "$value" ]] ; then
-    sed -i.tmp -e "s#^$key=.*\$##" -e '/^$/d' $database_file
+
+  if [[ "unset" = "$value" || "delete" = "$value" ]] ; then
+
+    sed -e "s#^$key=.*\$##" -e '/^$/d' "$database_file" > "$database_file.new"
+
+    mv "$database_file.new" "$database_file"
+
   else
+
     if [[ -z "$value" ]] ; then # get
-      awk -F= '/^'"$key"'=/' $database_file | sed -e "s#^$key=##" -e '/^$/d'
+
+      awk -F= '/^'"$key"'=/' "$database_file" | sed -e "s#^$key=##" -e '/^$/d'
+
     else # set
-      if [[ -z "$(awk -F= "/^'"$key"'=/{print $2}" $database_file)" ]] ; then # append
-        echo "$key=$value" >> $database_file
+
+      sed -e "s#^$key=.*\$##" -e '/^$/d' "$database_file" > "$database_file.new"
+
+      mv "$database_file.new" "$database_file"
+
+      if [[ -z "$(awk -F= "/^'"$key"'=/{print $2}" "$database_file")" ]] ; then # append
+
+        echo "$key=$value" >> "$database_file"
+
       else # overwrite
-        sed -i.tmp "s#^$key=.*\$#$key=$value#" $database_file
+
+        sed -i.tmp "s#^$key=.*\$#$key=$value#" "$database_file" > "$database_file.new"
+
+        mv "$database_file.new" "$database_file"
+
       fi
+
     fi
+
   fi
+
 fi
 

data/scripts/gemsets

@@ -24,21 +24,30 @@ usage() {
 }
 
 gemset_update() {
+
   if [[ -z "$rvm_ruby_strings" ]]; then
+
     "$rvm_path/scripts/log" "info" "Running gem update for all rubies and gemsets."
 
     rvm_ruby_strings="$(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ; find . -maxdepth 1 -mindepth 1 -type d -print 2>/dev/null | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
+
     rvm_ruby_strings="${rvm_ruby_strings/%,}"
+
     rvm_ruby_strings="${rvm_ruby_strings//.\/}"
+
   else
     "$rvm_path/scripts/log" "info" "Running gem update for the specified rubies."
   fi
+
   export rvm_ruby_strings
+
   "$rvm_path/scripts/set" "gem" "update"
+
   return $?
 }
 
 gemset_globalcache() {
+
   local gc_status globalcache_enabled directories directory_name full_directory_path directory_name
 
   if [[ "$1" == "enabled" ]]; then
@@ -46,6 +55,7 @@ gemset_globalcache() {
     __rvm_using_gemset_globalcache
 
     globalcache_enabled=$?
+
     gc_status="Unknown"
 
     if [[ $globalcache_enabled -eq 0 ]]; then
@@ -54,13 +64,15 @@ gemset_globalcache() {
       gc_status="Disabled"
     fi
 
-    "$rvm_path/scripts/log" "info" "Gemset global cache is currently: $gc_status"
+    "$rvm_path/scripts/log" "info" \
+      "Gemset global cache is currently: $gc_status"
 
     return "$globalcache_enabled"
 
   elif [[ "$1" == "disable" ]]; then
 
-    "$rvm_path/scripts/log" "info" "Removing the global cache (note: this will empty the caches)"
+    "$rvm_path/scripts/log" "info" \
+      "Removing the global cache (note: this will empty the caches)"
 
     directories=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ; find . -maxdepth 1 -mindepth 1 -type d -print))
 
@@ -70,7 +82,8 @@ gemset_globalcache() {
 
       if [[ -L "$current_cache_path" && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
 
-        "$rvm_path/scripts/log" "info" "Reverting the gem cache for $directory_name to an empty directory."
+        "$rvm_path/scripts/log" "info" \
+          "Reverting the gem cache for $directory_name to an empty directory."
 
         rm -f "$current_cache_path" 2>/dev/null
 
@@ -82,7 +95,8 @@ gemset_globalcache() {
 
   elif [[ "$1" == "enable" ]]; then
 
-    "$rvm_path/scripts/log" "info" "Enabling global cache for gems."
+    "$rvm_path/scripts/log" "info" \
+      "Enabling global cache for gems."
 
     mkdir -p "$rvm_gems_cache_path"
 
@@ -440,14 +454,22 @@ gemset_export() {
 
 gemset_import() {
 
+  unset -f gem
+
   if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
+    export GEM_PATH="$rvm_ruby_gem_home"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
+  else
+    rvm_ruby_gem_home=${GEM_HOME:-$(gem env gemdir)}
   fi
 
-  rvm_file_name="${gems_args}"
+  #rvm_gemset_name="${gems_args//.gem*/}"
+  #rvm_gemset_name="${gems_args// /}"
 
+  rvm_file_name="${gems_args// /}"
+
+  # TODO: this could likely be better with find
   if [[ -s "${rvm_file_name%.gems*}.gems" ]] ; then
     rvm_file_name="${rvm_file_name%.gems*}.gems"
 
@@ -468,7 +490,13 @@ gemset_import() {
     return 1
   fi
 
-  mkdir -p "$rvm_gems_cache_path" # Ensure the base cache dir is initialized.
+  if [[ ! -d "$rvm_ruby_gem_home/specifications/" ]] ; then
+    mkdir -p "$rvm_ruby_gem_home/specifications/"
+  fi
+
+  if [[ ! -d "$rvm_gems_cache_path" ]] ; then
+    mkdir -p "$rvm_gems_cache_path" # Ensure the base cache dir is initialized.
+  fi
 
   if [[ -s "$rvm_file_name" ]] ; then
 
@@ -537,7 +565,7 @@ __rvm_parse_gems_args() {
 # Install a gem
 gem_install() {
 
-  local result gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
+  local gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
 
   result=0
 
@@ -608,15 +636,17 @@ gem_install() {
 
     if [[ -n "$rvm_ruby_gem_home" && "$rvm_ruby_gem_home" != "${rvm_gems_path:-"$rvm_path/gems"}" ]] ; then
 
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} command gem install $gems_args $rvm_gem_options $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' BUNDLE_PATH='${rvm_ruby_gem_home}' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
 
     else
 
       #--ignore-dependencies
-      command="$gem_prefix command gem install --ignore-dependencies $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
+      command="$gem_prefix gem install --ignore-dependencies $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
 
     fi
 
+    unset -f gem
+
     __rvm_run "gem.install" "$command" "installing ${gem_name} ${gem_version}..."
     result=$?
 
@@ -717,37 +747,52 @@ gemset_pristine() {
 # Loads the default gemsets for the current interpreter and gemset.
 gemset_initial() {
 
+  local gemsets gemset path paths
+
+  rvm_gemsets_path="${rvm_gemsets_path:-"$rvm_path/gemsets"}"
+
   "$rvm_path/scripts/log" "info" \
     "Importing initial gemsets for $(__rvm_environment_identifier)."
 
-  mkdir -p "$rvm_path/gemsets/${rvm_ruby_string//-//}" 2>/dev/null
+  if [[ ! -d "$rvm_gemsets_path/${rvm_ruby_string//-/\/}" ]] ; then
+    mkdir -p "$rvm_gemsets_path/${rvm_ruby_string//-/\/}" 2>/dev/null
+  fi
 
-  for gemsets_path in $(__rvm_ruby_string_paths_under "$rvm_path/gemsets") ; do
+  paths=($(__rvm_ruby_string_paths_under "$rvm_gemsets_path"))
 
-    # TODO: This can be condensed.
-    if [[ -d "$gemsets_path" ]] ; then
+  echo "paths: ${paths[@]}"
+
+  for path in "${paths[@]}" ; do
+
+    if [[ -n "$rvm_gemset_name" ]] ; then
+
+      if [[ -s "${rvm_gemset_name}.gems" ]] ; then
+
+        ( gems_args="${rvm_gemset_name}.gems" ; gemset_import )
 
-      if [[ -n "$rvm_gemset_name" && -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then
-        (
-        rvm --create "$rvm_ruby_string"
-        "$rvm_path/scripts/gemsets" import "${gemsets_path}/${rvm_gemset_name}.gems"
-        )
       fi
 
-      if [[ -s "${gemsets_path}/default.gems" ]] ; then
-        (
-        rvm --create "$rvm_ruby_string"
-        "$rvm_path/scripts/gemsets" import "$gemsets_path/default.gems"
-        )
+    else
+
+      if [[ -s "${path}/default.gems" ]] ; then
+
+        ( gems_args="${path}/default.gems" ; gemset_import  )
+
       fi
 
-      if [[ -s "${gemsets_path}/global.gems" ]] ; then
+      if [[ -s "${path}/global.gems" ]] ; then
+
         (
-        rvm --create "$rvm_ruby_string@global"
-        "$rvm_path/scripts/gemsets" import "${gemsets_path}/global.gems"
+          rvm_create_flag=1
+          rvm_ruby_gem_home="${rvm_ruby_gem_home//@*/}@global"
+          gems_args="${path}/global.gems"
+          gemset_import
         )
+
       fi
+
     fi
+
   done
 
   "$rvm_path/scripts/log" "info" \
@@ -773,10 +818,15 @@ export rvm_gemset_name="${args[1]:-""}" # For wherever used.
 rvm_sticky_flag=1
 
 if [[ -z "$rvm_ruby_string" ]] ; then
+
   if echo "${GEM_HOME:-""}" | grep -q 'rvm' ; then
+
     rvm_ruby_string="${GEM_HOME##*/}"
+
     rvm_ruby_string="${rvm_ruby_string%%@*}"
+
   fi
+
 fi
 
 case "$action" in