rvm 1.0.5 → 1.0.6

data/scripts/migrate

@@ -10,9 +10,12 @@ usage() {
 }
 
 confirm() {
-  printf "$1 (Y/n): "
   local confirmation_response
+
+  printf "$1 (Y/n): "
+
   read -r confirmation_response
+
   [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | \grep -qi '^y'
 }
 
@@ -26,79 +29,116 @@ expand_ruby_name() {
 }
 
 migrate_rubies() {
+  local origin_gemset destination_gemset gemset_name migrate_ruby_name migrate_alias_name migrate_new_alias_name binaries origin_wrappers_path full_bin_path expanded_symlink linked_binary_name new_wrapper_destination
+
   expanded_source="$(expand_ruby_name "$source_ruby")"
   expanded_destination="$(expand_ruby_name "$destination_ruby")"
 
   if [[ -z "$expanded_source" ]]; then
     die_with_error "Could not expand source ruby '$source_ruby'"
+
   elif [[ -z "$expanded_destination" ]]; then
     die_with_error "Could not expand destination ruby '$destination_ruby'"
+
   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
     die_with_error "Ruby '$expanded_source' is not installed - please install it first."
+
   elif [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
     die_with_error "Ruby '$expanded_destination' is not installed - please install it first."
   fi
 
   echo "Are you sure you wish to MOVE gems from $expanded_source to $expanded_destination?"
+
   confirm "This will overwrite existing gems in $expanded_destination and remove them from $expanded_source" || return 1
 
   echo "Moving gemsets..."
 
   while read -r origin_gemset; do
     [[ "$origin_gemset" = "$expanded_source" || "$origin_gemset" = "$expanded_source$rvm_gemset_separator"* ]] || continue
+
     gemset_name="${origin_gemset/*${rvm_gemset_separator}/}"
+
     destination_gemset="$expanded_destination"
+
     if [[ -n "$gemset_name" ]]; then
       destination_gemset="$destination_gemset$rvm_gemset_separator$gemset_name"
     fi
+
     echo "Moving $origin_gemset to $destination_gemset"
 
-    \rm -rf "$rvm_gems_path/$destination_gemset"
+    rm -rf "$rvm_gems_path/$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/$destination_gemset'" "$result"
 
     mv "$rvm_gems_path/$origin_gemset" "$rvm_gems_path/$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/$origin_gemset' to '$rvm_gems_path/$destination_gemset'" "$result"
 
     echo "Making gemset $destination_gemset pristine."
+
     __rvm_run_with_env "gemset.pristine" "$destination_gemset" "rvm gemset pristine"
+
   done < <("$rvm_scripts_path/list" gemsets strings | \grep "^$expanded_source")
-  unset origin_gemset destination_gemset gemset_name
+
 
   if confirm 'Do you wish to move over aliases?' ; then
+
     while read -r alias_pair; do
+
       migrate_ruby_name="${alias_pair/*=/}"
+
       migrate_alias_name="${alias_pair/=*/}"
+
       if [[ "$migrate_ruby_name" = "$expanded_source" || "$migrate_ruby_name" = "$expanded_source$rvm_gemset_separator"* ]]; then
+
         migrate_new_alias_name="${migrate_ruby_name/$expanded_source/$expanded_destination}"
+
         echo "Updating alias $migrate_alias_name to point to $migrate_new_alias_name"
+
         "$rvm_scripts_path/alias" delete "$migrate_alias_name" >/dev/null 2>&1
+
         "$rvm_scripts_path/alias" create "$migrate_alias_name" "$migrate_new_alias_name" >/dev/null 2>&1
       fi
+
     done < "$rvm_config_path/alias"
-    unset migrate_ruby_name migrate_alias_name migrate_new_alias_name
+
   fi
 
   if confirm "Do you wish to move over wrappers?" ; then
+
     origin_wrappers_path="$rvm_wrappers_path/$expanded_source"
-    for binary_name in $(\ls "$rvm_bin_path") ; do
+
+    binaries=($(cd "$rvm_bin_path" ; find * -type f -maxdepth 0))
+
+    for binary_name in "${binaries[@]}" ; do
+
       full_bin_path="$rvm_bin_path/$binary_name"
+
       [[ ! -L "$full_bin_path" ]] && continue
+
       expanded_symlink="$(readlink "$full_bin_path")"
+
       [[ "$expanded_symlink" != "$origin_wrappers_path/"* ]] && continue
+
       linked_binary_name="$(basename "$expanded_symlink")"
+
       [[ "$binary_name" = "$linked_binary_name-$expanded_source" || "$binary_name" = "$expanded_source" ]] && continue
+
       new_wrapper_destination="${expanded_symlink/$expanded_source/$expanded_destination}"
+
       ln -sf "$new_wrapper_destination" "$full_bin_path"
     done
-    unset origin_wrappers_path full_bin_path expanded_symlink linked_binary_name new_wrapper_destination
   fi
 
   if confirm "Do you also wish to completely remove $expanded_source (inc. archive)?" ; then
+
     __rvm_run_with_env "rvm.remove" "$expanded_source" "rvm remove $expanded_source --archive --gems"
+
   fi
 
   echo "Successfully migrated $expanded_source to $expanded_destination"

data/scripts/override_gem

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_leave_gem_alone" ]]; then
+if [[ ${rvm_leave_gem_alone:-0} -eq 0 ]]; then
   gem() {
-    command gem "$@"
-    local gem_result="$?"
+    local result
+
+    command gem "$@" ; result="$?"
+
     hash -r
-    return $gem_result
+
+    return $result
   }
-fi
+fi

data/scripts/package

@@ -7,8 +7,8 @@ source "$rvm_scripts_path/base"
 
 # Tools to make managing ruby dependencies inside of rvm easier.
 args=($*)
-action="${args[0]}"
-library="${args[1]}"
+action="${args[0]:-""}"
+library="${args[1]:-""}"
 args="$(echo ${args[@]:2})"
 
 install_package() {
@@ -191,12 +191,15 @@ llvm() {
   )
 }
 
-if [[ ! -z "$library" ]] ; then
-  if [[ " readline iconv curl openssl zlib autoconf ncurses pkgconfig gettext glib mono llvm libxml2 " =~ "$library" ]] ; then
-    ${library}
-  else
-    "$rvm_scripts_path/log" "error" "Package '${library}' is unknown."
-  fi
+if [[ -n "$library" ]] ; then
+  case $library in
+    readline|iconv|curl|openssl|zlib|autoconf|ncurses|pkgconfig|gettext|glib|mono|llvm|libxml2)
+      ${library}
+    ;;
+    *)
+      "$rvm_scripts_path/log" "error" "Package '${library}' is unknown."
+    ;;
+  esac
 else
   "$rvm_scripts_path/log" "info" "Usage: 'rvm package {install,uninstall} {readline,iconv,curl,openssl,zlib,autoconf,ncurses,pkgconfig,gettext,glib,mono,llvm,libxml2}'"
   exit 1

data/scripts/patches

@@ -12,27 +12,45 @@ __rvm_patch_lookup_path() {
 }
 
 __rvm_expand_patch_name() {
-  local name="$1"
+  local name expanded_patch_name
+
+  name="${1:-""}"
+
   [[ -z "$name" ]] && return 0
+
   expanded_patch_name="$("$rvm_scripts_path/patchsets" show "$name")"
+
   if [[ "$?" == "0" ]]; then
     echo "${expanded_patch_name}"
+
   elif [[ "$name" != "default" ]]; then
     echo "$name"
-  fi ; unset expanded_patch_name
+  fi
+
+  return 0
 }
 
 # Return the full patch for a given patch.
 __rvm_lookup_full_patch_path() {
+  local extension patch_path directory directories
+
   # Absolute path, pwd and then finally the rvm patches path.
-  for directory in $(__rvm_patch_lookup_path) ; do
+  directories=($(__rvm_patch_lookup_path))
+
+  for directory in "${directories[@]}" ; do
+
     for extension in {"",.patch,.diff}; do
+
       patch_path="${directory}${1}${extension}"
+
       if [[ -s "$patch_path" ]]; then
         echo "$patch_path"
-        return
+        return 0
       fi
-    done; unset extension patch_path
-  done; unset directory
+
+    done
+
+  done
+
   return 1
 }

data/scripts/repair

@@ -15,7 +15,8 @@ repair_symlinks() {
     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")"
+        "$rvm_scripts_path/log" "info" \
+          "Removing stale symlink from $(basename "$executable_name")"
         \rm -f "$executable_name"
       fi
     done
@@ -24,31 +25,69 @@ repair_symlinks() {
 
 # Regenerates each symlink file.
 repair_environments() {
-  for environment_name in $(\ls "$rvm_environments_path"); do
+  local environment_name environments
+
+  environments=($(cd "$rvm_environments_path" ; find * -type f -maxdepth 0))
+
+  for environment_name in "${environments[@]}" ; do
+
     [[ -L "$rvm_environments_path/$environment_name" ]] && continue
-    "$rvm_scripts_path/log" "info" "Regenerating environment file for '$environment_name'"
+
+    "$rvm_scripts_path/log" "info" \
+      "Regenerating environment file for '$environment_name'"
+
     [[ -f "$rvm_environments_path/$environment_name" ]] && \rm -f "$rvm_environments_path/$environment_name"
-    (source "$rvm_scripts_path/base"; __rvm_become "$environment_name"; __rvm_ensure_has_environment_files)
-  done; unset environment_name
+
+    (
+    source "$rvm_scripts_path/base"
+
+    __rvm_become "$environment_name"
+
+    __rvm_ensure_has_environment_files
+    )
+
+  done
 }
 
 # Removes archives that have incorrect md5 sums.
 repair_archives() {
-  for archive_file in $(\ls "$rvm_archives_path"); do
+
+  local archive_file archives stored_md5sum
+
+  archives=($(cd "$rvm_archives_path" ; find * -type f -maxdepth 0))
+
+  for archive_file in "${archives[@]}" ; do
+
     [[ -f "$rvm_archives_path/$archive_file" ]] || continue
-    local stored_md5sum="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
-    if [[ -n "$stored_md5sum" ]] && ! "$rvm_scripts_path/md5" "$rvm_archives_path/$archive_file" "$stored_md5sum" ; then
-      "$rvm_scripts_path/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
-      \rm -rf "$rvm_archives_path/$archive_file"
+
+    stored_md5sum="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
+
+    if [[ -n "$stored_md5sum" ]] ; then
+
+      if [[ ! "$rvm_scripts_path/md5" "$rvm_archives_path/$archive_file" "$stored_md5sum" ]] ; then
+
+        "$rvm_scripts_path/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
+
+        rm -rf "$rvm_archives_path/$archive_file"
+      fi
     fi
-  done; unset archive_file
+  done
+
+  return 0
 }
 
 repair_all() {
+
   repair_symlinks
+
   repair_archives
+
   repair_environments
-  "$rvm_scripts_path/log" "info" "All items repaired."
+
+  "$rvm_scripts_path/log" "info" \
+    "symlinks, archives and environments have been repaired."
+
+  return 0
 }
 
 args=($*)
@@ -56,7 +95,8 @@ action="${args[0]}"
 args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
 
 if [[ -z "$action" ]]; then
-  usage ; exit $?
+  usage
+  exit $?
 fi
 
 case "$action" in

data/scripts/rvm

@@ -63,7 +63,8 @@ if [[ $rvm_loaded_flag -eq 0 || $rvm_reload_flag -eq 1 ]] ; then
 
     rvm_loaded_flag=1
 
-    rvm_version="$(tail -n 3 < "${rvm_path}/lib/VERSION.yml" | sed -e 's/^.*: //g' | \tr "\n" '.' | sed -e 's/\.$//')" ; export rvm_version
+    rvm_version="$(awk '/:/{printf $NF"."}' "$rvm_path/lib/VERSION.yml")"
+    export rvm_version="${rvm_version/%.}"
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 

data/scripts/rvm-install

@@ -383,7 +383,8 @@ for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
 done; unset file
 printf "\n    Copying manpages into place."
-for man_file in $(ls "$install_source_path/man"); do
+
+for man_file in $(builtin cd "$install_source_path/man" ; find * -type f -maxdepth 0 -print); do
   rm -rf "$rvm_man_path/$man_file"
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done

data/scripts/selector

@@ -217,7 +217,7 @@ __rvm_select() {
       rvm_ruby_minor_version="${rvm_ruby_version//*.}"
     fi
 
-    rvm_ruby_package_name="${rvm_ruby_package_name:-$(echo $rvm_ruby_string | sed -e 's/-n.*$//')}"
+    rvm_ruby_package_name="${rvm_ruby_package_name:-${rvm_ruby_string//-n*}}"
     rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_string"
     rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
     rvm_ruby_repo_path="$rvm_repo_path/$rvm_ruby_string"
@@ -241,24 +241,19 @@ __rvm_select() {
 
     \mkdir -p "$rvm_ruby_log_path"
 
-    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
+    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_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_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_gemset_name="${rvm_gemset_name:-""}"
   rvm_ruby_gem_home="${rvm_ruby_gem_home:-""}"
   rvm_wrapper_name="${rvm_wrapper_name:-""}"
   rvm_ruby_alias="${rvm_ruby_alias:-""}"
 
-  local new_path=""
+  local new_path binary full_binary_path
 
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
 
@@ -282,7 +277,6 @@ __rvm_use() {
     fi
 
     # Check binaries, remove under the condition they're symlinks.
-    local binary full_binary_path
     if [[ "$rvm_selfcontained" = "0" ]] ; then
 
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
@@ -311,7 +305,7 @@ __rvm_use() {
 
     if [[ ! -d "$MY_RUBY_HOME" ]] ; then
       "$rvm_scripts_path/log" "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
-      if [[ $rvm_install_on_use_flag -eq 1 ]] ; then
+      if [[ ${rvm_install_on_use_flag:-0} -eq 1 ]] ; then
         "$rvm_scripts_path/manage" "install" "$rvm_ruby_string"
       else
         "$rvm_scripts_path/log" "info" "To install do: 'rvm install $rvm_ruby_string'"
@@ -323,14 +317,17 @@ __rvm_use() {
     __rvm_ensure_has_environment_files
 
     [[ ${rvm_verbose_flag:-0} -gt 0 ]] && \
-      "$rvm_scripts_path/log" "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
+      "$rvm_scripts_path/log" "info" \
+      "Using ${GEM_HOME/${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")"
   fi
 
   # Export ruby string and gem set me for extrenal scripts to take advantage of them.
   if [[ -n "${rvm_ruby_string:-""}" ]]  ; then export rvm_ruby_string  ; fi
+
   if [[ -n "${rvm_gemset_name:-""}" ]]  ; then export rvm_gemset_name ; fi
+
   if [[ -n "$new_path" ]]; then
     export PATH="$new_path"
     unset new_path
@@ -342,18 +339,21 @@ __rvm_use() {
   local environment_id="$(__rvm_environment_identifier)"
 
   if [[ ${rvm_default_flag:-0} -eq 1 && "default" != "${rvm_ruby_interpreter:-""}" ]] ; then
+
     if [[ "${rvm_selfcontained:-""}" = "0" ]] ; then
       # Sets up the default wrappers.
       "$rvm_scripts_path/wrapper" "$rvm_ruby_string" --no-prefix
     else
       "$rvm_scripts_path/wrapper" "$rvm_scripts_path" "default"
     fi
+
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       "$rvm_scripts_path/alias" delete default &> /dev/null
-      \find "$rvm_bin_path" -name 'default_*' -maxdepth 1 -delete
+      \find "$rvm_bin_path" -name 'default_*' -maxdepth 0 -delete
       \rm -f "$rvm_config_path/default"
       \rm -f "$rvm_environments_path/default"
       \rm -rf "$rvm_wrappers_path/default"
+
     else
       RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
@@ -432,103 +432,131 @@ __rvm_ruby_string() {
 
   __rvm_unset_ruby_variables
 
-  for string in $(printf "${ruby_string//-/ }") ; do
+  strings=(${ruby_string//-/ })
+
+  for string in "${strings[@]}" ; do
+
+    # TODO: case...
+
+    case "$string" in
+      head)
 
-    if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"
       rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag=""
       export rvm_head_flag=1
+      ;;
 
-    elif [[ "system" = "$string" ]] ; then
+    system)
       rvm_ruby_interpreter="system"
       rvm_ruby_patch_level="" ; rvm_ruby_tag="" ; rvm_head_flag=0 ; rvm_ruby_revision="" ; rvm_ruby_version="" ; rvm_gemset_name=""
       return 0
+      ;;
 
-    elif [[ "nightly" = "$string" ]] ; then
+    nightly)
       rvm_ruby_version="nightly"
       rvm_nightly_flag=1
       break
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^preview" ; then
+    preview*)
       rvm_ruby_patch_level="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^rc[0-9]" ; then
+    rc[[:digit:]]*)
       rvm_ruby_patch_level="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^[0-9]\.[0-9]" ; then
+    [[:digit:]]\.[[:digit:]]*)
       rvm_ruby_version="$string"
-      rvm_ruby_revision="" ; rvm_ruby_tag=""
+      rvm_ruby_revision=""
+      rvm_ruby_tag=""
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^p[0-9]" ; then
+    p[[:digit:]]*)
       rvm_ruby_patch_level="$string"
-
-    elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_scripts_path/match" "$string" "^[0-9][0-9]" ; then
-      if [[ "ree" = "${rvm_ruby_interpreter:-""}" ]] ; then
-        rvm_ruby_patch_level="$string"
-        rvm_ruby_revision=""
-
-      elif [[ "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
-        rvm_ruby_patch_level="$string"
-
-      elif [[ "maglev" = "${rvm_ruby_interpreter:-""}" ]] ; then
-        rvm_ruby_version="$string" ; rvm_ruby_revision="" ; rvm_ruby_patch_level=""
-
-      else
-        rvm_ruby_revision="r$string"
-      fi
-
-    elif "$rvm_scripts_path/match" "$string" "^r[0-9]" ; then
+      ;;
+
+    #elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_scripts_path/match" "$string" "^
+    [[:digit:]][[:digit:]]*)
+
+      case "${rvm_ruby_interpreter:-""}" in
+        ree)
+          rvm_ruby_patch_level="$string"
+          rvm_ruby_revision=""
+          ;;
+
+        rbx)
+          rvm_ruby_patch_level="$string"
+          ;;
+
+        maglev)
+          rvm_ruby_version="$string"
+          rvm_ruby_revision=""
+          rvm_ruby_patch_level=""
+          ;;
+
+        *)
+          rvm_ruby_revision="r$string"
+          ;;
+      esac
+      ;;
+
+    r[[:digit:]]*)
       rvm_ruby_patch_level=""
       rvm_ruby_revision="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^s[0-9]" ; then
+    s[[:digit:]]*)
       rvm_ruby_revision=""
       rvm_ruby_sha="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^t[v0-9]" ; then
+    tv[[:digit:]]* | t[[:digit:]]*)
       rvm_ruby_patch_level="" ; rvm_ruby_revision=""
       rvm_ruby_tag="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^m[0-9]" ; then
+    m[[:digit:]]*)
       rvm_ruby_mode="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^u[a-z0-9]" ; then
+    u[[:alnum:]]*)
       rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag="" ; rvm_ruby_patch=""
       rvm_ruby_user_tag="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^b[0-9][0-9]" ; then
+    b[[:digit:]][[:digit:]]*)
       rvm_ruby_bits="$string"
+      ;;
 
-    elif "$rvm_scripts_path/match" "$string" "^n" ; then
+    n*)
       rvm_ruby_name="${string/n/}"
+      ;;
 
-    elif [[ "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby " =~ "$string " ]] ; then
-      # NOTE: The space at the end of each of the above strings is *very* important.
+    ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
       rvm_ruby_interpreter="$string"
+      ;;
 
-    else
-      "$rvm_scripts_path/log" "error" "Unknown ruby string component: '$string'"
+    *)
+      "$rvm_scripts_path/log" "error" \
+        "Unknown ruby string component: '$string'"
       return 1
-    fi
+      ;;
+    esac
   done
 
-  # Unspecified interpreter
   if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then
-
-    if "$rvm_scripts_path/match" "$rvm_ruby_version" "^1\.[8-9]" ; then
-      rvm_ruby_interpreter="ruby"
-
-    elif "$rvm_scripts_path/match" "$rvm_ruby_version" "^0.5" ; then
-      rvm_ruby_interpreter="macruby"
-
-    elif "$rvm_scripts_path/match" "$rvm_ruby_version" "^1.[2-4]" ; then
-      rvm_ruby_interpreter="jruby"
-    fi
+    # Detect interpreter based on version.
+    case "$rvm_ruby_version" in
+      1.[8-9]*) rvm_ruby_interpreter="ruby"    ;;
+      0.[5-6]*) rvm_ruby_interpreter="macruby" ;;
+      1.[2-7]*) rvm_ruby_interpreter="jruby"   ;;
+    esac
   fi
 
   # Unspecified version
   rvm_ruby_version=${rvm_ruby_version:-""}
-  if [[ -z "${rvm_ruby_version:-""}" || ${rvm_head_flag:-0} -eq 0 ]] ; then
+  if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]] ; then
     rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
   fi
 
@@ -568,15 +596,15 @@ __rvm_ruby_string() {
 
     if [[ -n "${rvm_ruby_patch_level:-""}" ]] ; then
 
-      rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
+      rvm_ruby_patch_level="${rvm_ruby_patch_level/#pp/p}"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
 
-      if [[ "ree" = "${rvm_ruby_interpreter:-""}" ]] || [[ "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
-        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-p*#-#')"
+      if [[ "ree" = "${rvm_ruby_interpreter:-""}" || "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
+        rvm_ruby_string="${rvm_ruby_string//-p*/-}"
 
       else
-        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
-        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-prc#-rc#')"
+        rvm_ruby_string="${rvm_ruby_string//-pp/-p}"
+        rvm_ruby_string="${rvm_ruby_string//-prc/-rc}"
       fi
     fi
   fi
@@ -589,13 +617,13 @@ __rvm_ruby_string() {
 # Select a gemset based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
 __rvm_gemset_select() {
+
   command -v gem > /dev/null
   if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
 
   rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
   rvm_gemset_name=${rvm_gemset_name:-""}
-
-  rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global"
+  rvm_ruby_global_gems_path="$rvm_path/gems/${rvm_ruby_string:-""}${rvm_gemset_separator}global"
 
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
 
@@ -612,14 +640,15 @@ __rvm_gemset_select() {
       fi
     fi
 
-    if [[ -n "${rvm_gemset_name:-""}" ]] && ! "$rvm_scripts_path/match" "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
+    if ! echo "${rvm_gemset_name:-""}" | grep -q "^[[:digit:]]\.[[:digit:]]" ; then
+
       rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
 
     else
-      if [[ -n "${rvm_ruby_string:-""}" ]] && [[ "${rvm_ruby_interpreter:-""}" != "system" ]] ; then
+      if [[ -n "${rvm_ruby_string:-""}" && "${rvm_ruby_interpreter:-""}" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
 
-      elif [[ -z "${GEM_HOME:-""}" ]]  && [[ -n "$(command -v gem)" ]] ; then
+      elif [[ -z "${GEM_HOME:-""}" && -n "$(command -v gem)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
 
       elif [[ -n "${GEM_HOME:-""}" ]] ; then
@@ -654,10 +683,14 @@ __rvm_gemset_select() {
 
   # If the gemset does not exist, then notify the user as such and abort the action.
   if [[ -n "${rvm_gemset_name:-""}" && ! -d "$rvm_ruby_gem_home" ]] ; then
+
     if [[ ${rvm_gemset_create_on_use_flag:-0} -ne 1 && ${rvm_create_flag:-0} -ne 1 && ${rvm_delete_flag:-0} -ne 1 ]] ; then
+
       "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+
       return 1
     fi
+
   elif [[ ${rvm_delete_flag:-0} -eq 1 ]] ; then
     return 1
   fi
@@ -705,7 +738,7 @@ __rvm_gemset_use() {
       "$rvm_scripts_path/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
-    rvm_ruby_gem_home="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}${rvm_gemset_name}"
+    rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator}*}${rvm_gemset_separator}${rvm_gemset_name}"
     GEM_HOME="$rvm_ruby_gem_home"
     BUNDLE_PATH="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global/bin"
@@ -719,7 +752,7 @@ __rvm_gemset_use() {
 
 __rvm_gemset_clear() {
   rvm_gemset_name="" ; shift # TODO: Is this shift necessary???
-  rvm_ruby_gem_home="$(echo "${GEM_HOME:-""}" | sed "s#${rvm_gemset_separator:-'@'}.*\$##g")"
+  rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-'@'}*}"
   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"