rvm 1.0.1 → 1.0.2

data/binscripts/rvm-prompt

@@ -10,7 +10,7 @@ add(){
   fi
 }
 
-rvm_gemset_separator=${rvm_gemset_separator:-"+"}
+rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 ruby=$(command -v ruby)
 if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
   unset format
@@ -41,31 +41,30 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
 
   # Dont' display anything if no default flag was provided and we're using the default ruby
   if [[ -n "$no_default" && "$(rvm tools identifier)" = "$(rvm alias show default)" ]]; then
-	exit 0
+    exit 0
   fi
 
-  if [[ ! -z "$interpreter_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
-    interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
+  if [[ -n "$interpreter_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
+    interpreter="${ruby_string/-*/}"
   fi
 
-  if [[ ! -z "$version_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
-    version="$(echo $ruby_string | awk -F'-' '{print $2}')"
+  if [[ -n "$version_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
+    version="${ruby_string%-*}" ; version="${version#*-}"
   fi
 
-  if [[ ! -z "$patchlevel_flag" ]] ; then
-    patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
+  if [[ -n "$patchlevel_flag" ]] ; then
+    patchlevel="${ruby_string##*-}"
   fi
 
-  if [[ ! -z "$architecture_flag" ]] ; then
+  if [[ -n "$architecture_flag" ]] ; then
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
   fi
 
-  if [[ ! -z "$gemset_flag" ]] ; then
-    gemset="$(echo $GEM_HOME | awk -F${rvm_gemset_separator} '{print $2}')"
-    if [[ ! -z "$gemset" ]] ; then gemset="${rvm_gemset_separator}$gemset" ; fi
+  if [[ -n "$gemset_flag" && "$GEM_HOME" =~ ${rvm_gemset_separator} ]] ; then
+    gemset="${rvm_gemset_separator}${GEM_HOME/*${rvm_gemset_separator}/}"
   fi
 
-  if [[ ! -z "$unicode_flag" ]] ; then
+  if [[ -n "$unicode_flag" ]] ; then
     case "$interpreter" in
       jruby)    unicode="☯" ;;
       rbx)      unicode="☃" ;;
@@ -86,15 +85,15 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
       *) unicode="♢" ;;
     esac
 
-    if [[ ! -z "$(echo $ruby_string | awk '/-head/')" ]] ; then
+    if echo "$ruby_string" | \grep -q '-head' ; then
       unicode="${unicode}〠"
     fi
   fi
-  
+
   command="prompt=\"$format\""
   eval "$command"
   echo "$prompt" | sed -e 's#^[[:space:]]*-*##g' -e 's#--*#-#g' -e 's#-*[[:space:]]*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
-  
+
 else
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift

data/contrib/gemset_snapshot

@@ -7,7 +7,7 @@ for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';') ; do
   name="$(echo $gem | awk -F';' '{print $1}')"
   versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
   for version in $versions ; do
-    echo "$name -v$version" >> $file_name
+    echo "$name -v$version" >> "$file_name"
   done ; unset version versions
 done ; unset file_name
 

data/install

@@ -76,7 +76,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || \grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -93,7 +93,7 @@ __rvm_initialize
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
-cwd=$PWD
+cwd="$PWD"
 source_path="${source_path:-$cwd}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
@@ -151,7 +151,7 @@ done ; unset dir_name
 spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
   \mkdir -p "$rvm_config_path/"
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_config_path/user"
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
@@ -170,7 +170,7 @@ for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 spinner
-chmod +x $rvm_bin_path/*
+chmod +x "$rvm_bin_path"/*
 
 #
 # RC Files
@@ -179,17 +179,17 @@ spinner
 if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
-    for rcfile in $(echo $rvm_rc_files) ; do
+    for rcfile in $(printf $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
         if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> "$rcfile"
         fi
       fi
       if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
-        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
+        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> "$rcfile"
       fi
     done
   fi
@@ -254,26 +254,27 @@ done
 spinner
 printf "\r*" # Stop spinner.
 
-for gemset in $rvm_path/gems/*\%* ; do
+for gemset in "$rvm_path"/gems/*\%* ; do
   new_path=${gemset/\%/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
-    mv $gemset $new_path
+    printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+    mv "$gemset" "$new_path"
   fi
 done
 
-for gemset in $rvm_path/gems/*\+* ; do
+for gemset in "$rvm_path"/gems/*\+* ; do
   new_path=${gemset/\+/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
     mv $gemset $new_path
   fi
 done
-for gemset in $rvm_path/gems/*\@ ; do
+
+for gemset in "$rvm_path"/gems/*\@ ; do
   new_path=$(echo $gemset | sed -e 's#\@$##')
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
-    mv $gemset $new_path
+    printf "\n    Fixing: $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+    mv "$gemset" "$new_path"
   fi
 done
 
@@ -281,18 +282,16 @@ done
 if [[ -s "$rvm_config_path/default" ]]; then
   original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
-    $rvm_scripts_path/alias create default "$original_version" &> /dev/null
-  fi
-  unset original_version
+    "$rvm_scripts_path/alias" create default "$original_version" &> /dev/null
+  fi ; unset original_version
   \rm -rf "$rvm_config_path/default"
 fi
 
 #
 # End of gemset migration.
 #
-
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
-\mkdir -p $rvm_bin_path
+\mkdir -p "$rvm_bin_path"
 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

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 1
+:patch: 2

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-08-27}
+  s.date = %q{2010-09-03}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -127,7 +127,6 @@ Gem::Specification.new do |s|
      "scripts/maglev",
      "scripts/man",
      "scripts/manage",
-     "scripts/manpages",
      "scripts/match",
      "scripts/md5",
      "scripts/migrate",

data/scripts/alias

@@ -2,21 +2,21 @@
 
 unset rvm_default_flag rvm_wrapper_name
 
-source $rvm_scripts_path/base
+source "$rvm_scripts_path"/base
 
 alias_conflicts_with_ruby() {
   # If default exists, we should return true.
   [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
   # Open for suggestions to a better way of doing this...
   alias_check_result="$(
-    \. $rvm_scripts_path/initialize
-    \. $rvm_scripts_path/selector
-    export rvm_ruby_string="$1"
+    \. \"$rvm_scripts_path/initialize\"
+    \. \"$rvm_scripts_path/selector\"
+    export rvm_ruby_string=\"$1\"
     __rvm_ruby_string > /dev/null 2>&1
     echo "$?"
   )"
   if [[ "0" == "$alias_check_result" ]]; then
-    $rvm_scripts_path/log "error" "You are attempted to create an alias called '$1', which is recognized as a rvm ruby."
+    "$rvm_scripts_path"/log "error" "You are attempted to create an alias called '$1', which is recognized as a rvm ruby."
     return 0
   fi
   return 1
@@ -25,17 +25,21 @@ alias_conflicts_with_ruby() {
 
 show_alias() {
   if [[ -z "$alias_name" ]]; then
-    $rvm_scripts_path/log "error" "usage: 'rvm alias show [alias_name]'"
+    "$rvm_scripts_path"/log "error" "usage: 'rvm alias show [alias_name]'"
     result=1
     return
   fi
-  expanded_alias_name="$($rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name")"
+  expanded_alias_name="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"
   if [[ -z "$expanded_alias_name" ]]; then
-    $rvm_scripts_path/log "error" "Unknown alias name: '$alias_name'"
+    "$rvm_scripts_path"/log "error" "Unknown alias name: '$alias_name'"
     result=1
   else
     result=0
-    echo "$expanded_alias_name"
+    if [[ -n "$gemset_name" ]] ; then
+      printf "${expanded_alias_name}${rvm_gemset_separator}${gemset_name}"
+    else
+      printf "$expanded_alias_name"
+    fi
   fi
   unset expanded_alias_name
 }
@@ -45,7 +49,7 @@ delete_alias() {
   for link in "$rvm_rubies_path/$alias_name" ; do
     if [[ -L "$link" ]] ; then \rm -f $link ; fi
   done
-  $rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name" "delete"
+  "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "delete"
 }
 
 create_alias() {
@@ -54,7 +58,7 @@ create_alias() {
     alias_name=""
   fi
   if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
-    $rvm_scripts_path/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'"
+    "$rvm_scripts_path"/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'"
     result=1
   else
     if [[ -z "$rvm_alias" ]] ; then
@@ -67,21 +71,21 @@ create_alias() {
         rvm_ruby_string="$rvm_environment_identifier"
       fi
       if [[ -z "$rvm_ruby_string" ]]; then
-        $rvm_scripts_path/log "error" "unknown ruby string specified"
+        "$rvm_scripts_path"/log "error" "unknown ruby string specified"
         result=1
         return
       fi
       final_environment_identifier="$(__rvm_environment_identifier)"
-      $rvm_scripts_path/log "info" "Creating alias $alias_name for $final_environment_identifier."
+      "$rvm_scripts_path"/log "info" "Creating alias $alias_name for $final_environment_identifier."
       ln -nfs "$rvm_rubies_path/$rvm_ruby_string" "$rvm_rubies_path/$alias_name"
-      $rvm_scripts_path/log "info" "Recording alias $alias_name for $final_environment_identifier."
-      $rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
+      "$rvm_scripts_path"/log "info" "Recording alias $alias_name for $final_environment_identifier."
+      "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
     else
       if [[ -d "$rvm_rubies_path/$alias_name" ]] ; then
-        $rvm_scripts_path/log "error" "$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name."
+        "$rvm_scripts_path"/log "error" "$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name."
         result=1
       else
-        $rvm_scripts_path/log "error" "$rvm_rubies_path/$alias_name is already aliased."
+        "$rvm_scripts_path"/log "error" "$rvm_rubies_path/$alias_name is already aliased."
         result=1
       fi
     fi
@@ -91,7 +95,7 @@ create_alias() {
 alias_list() {
   for item in $rvm_rubies_path/* ; do
     if [[ -L "$item" ]] ; then
-      echo "$(basename $item) => $($rvm_scripts_path/db "$rvm_config_path/alias" "$(basename "$item")")"
+      echo "$(basename "$item") => $("$rvm_scripts_path"/db "$rvm_config_path/alias" "$(basename "$item")")"
     fi
   done; unset item
 }
@@ -100,8 +104,12 @@ action="$1"
 alias_name="$2"
 rvm_environment_identifier="$3"
 if [[ ! -f "$rvm_config_path/alias" ]] ; then \touch "$rvm_config_path/alias" ; fi
+if printf "$alias_name" | \grep -q "$rvm_gemset_separator" ; then
+  gemset_name="${alias_name/*${rvm_gemset_separator}/}"
+  alias_name="${alias_name/${rvm_gemset_separator}*/}"
+fi
 if [[ ! -z "$alias_name" ]] ; then
-  rvm_alias="$($rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name")"
+  rvm_alias="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"
 fi
 
 # CLI API:
@@ -118,7 +126,7 @@ elif [[ "$action" = "list" ]] ; then
 elif [[ "$action" = "show" ]]; then
   show_alias
 else
-  $rvm_scripts_path/log "error" "usage: 'rvm alias [action] [arguments]"
+  "$rvm_scripts_path"/log "error" "usage: 'rvm alias [action] [arguments]"
 fi
 
 unset action alias_name rvm_ruby_string rvm_environment_identifier final_environment_identifier

data/scripts/base

@@ -5,7 +5,7 @@
 # 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_scripts_path/$script_name
+    source "$rvm_scripts_path"/$script_name
   fi
 done; unset script_name rvm_base_except
 

data/scripts/cleanup

@@ -12,7 +12,7 @@ cleanup() {
   for cleanup_type in $1; do
     eval "current_path=\"\$rvm_${cleanup_type}_path\""
     if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
-      $rvm_scripts_path/log "info" "Cleaning up rvm directory '$current_path'"
+      "$rvm_scripts_path"/log "info" "Cleaning up rvm directory '$current_path'"
       \rm -rf "$current_path"/* >/dev/null 2>&1
     fi
   done; unset cleanup_type current_path

data/scripts/cli

@@ -9,7 +9,6 @@ __rvm_run_script() {
 }
 
 __rvm_parse_args() {
-
   # TODO:
   #       Make this more robust '__rvm_history' so that it stores *unique* rvm commands.
   #       Otherwise this file gets big rather fast.
@@ -51,13 +50,13 @@ __rvm_parse_args() {
       ;;
 
       # Can likely remove this due to the *) case
-      jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|maglev|all)
+      jruby*|ree*|macruby*|rbx*|rubinius*|mput*|shyouhei*|ironruby*|default*|maglev*|all)
         if [[ "rubinius" = "$rvm_token" ]] ; then rvm_token="rbx"; fi
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
         rvm_ruby_strings="$rvm_token"
         rvm_action="${rvm_action:-use}"
-        if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
+        if "$rvm_scripts_path"/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
       ;;
 
       gemset)
@@ -84,9 +83,9 @@ __rvm_parse_args() {
           rvm_delete_flag=1
           rvm_ruby_args="$@" ; shift
           rvm_gemset_name="$1"; shift
-          if [[ ! -z "$(echo $rvm_gemset_name | \grep $rvm_gemset_separator)" ]] ; then
-            rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
-            rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
+          if echo "$rvm_gemset_name" | \grep -q "$rvm_gemset_separator" ; then
+            rvm_ruby_string=$(echo "$rvm_gemset_name" | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
+            rvm_gemset_name=$(echo "$rvm_gemset_name" | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
               rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
             fi
@@ -103,7 +102,7 @@ __rvm_parse_args() {
         rvm_action=$rvm_token
         rvm_gemdir_flag=1
         if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
-        if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
+        if [[ "user" = "$1" ]]   ; then rvm_user_flag=1  ;  shift ; fi
       ;;
 
       inspect|list|info)
@@ -151,7 +150,7 @@ __rvm_parse_args() {
               rvm_action="error"
               rvm_error_message="'rvm $rvm_action' must be followed by arguments."
             elif [[ "ruby" = "$rvm_action" ]] ; then
-              if [[ -z "$(echo "$rvm_ruby_strings" | awk '/,/')" ]] ; then
+              if echo "$rvm_ruby_strings" | \grep -q ',' ; then
                 rvm_action="ruby"
                 rvm_ruby_args=""
               else
@@ -172,14 +171,14 @@ __rvm_parse_args() {
             rvm_parse_break=1
           fi
         else
-          if $rvm_scripts_path/match "$1" "^-" ; then
+          if "$rvm_scripts_path"/match "$1" "^-" ; then
             unset rvm_ruby_strings
           else
-            if $rvm_scripts_path/match "$1" "^[0-9]" ; then
-              rvm_ruby_strings=$(echo "$1" | \tr ',' ' ') ; shift
+            if "$rvm_scripts_path"/match "$1" "^[0-9]" ; then
+              rvm_ruby_strings="${1//,/ }" ; shift
               unset rvm_ruby_interpreter
             else
-              if $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" "$1" ; then
+              if [[ "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" =~ $1 ]] ; then
                 rvm_ruby_strings=$1
                 rvm_ruby_interpreter=$1
                 shift
@@ -197,7 +196,7 @@ __rvm_parse_args() {
 
       specs|tests)
         rvm_action="rake"
-        rvm_ruby_args="$(echo $rvm_token | sed 's/s$//')"
+        rvm_ruby_args="$(echo $rvm_token | sed -e 's/s$//')"
       ;;
 
       -v|--version)
@@ -215,7 +214,7 @@ __rvm_parse_args() {
 
       --ree-options)
         if [[ ! -z "$1" ]] ; then
-          export rvm_ree_options="$(echo $1 | \tr ',' ' ')" ; shift
+          export rvm_ree_options="${1//,/ }" ; shift
         else
           rvm_action="error"
           rvm_error_message="--ree-options *must* be followed by... well... options."
@@ -277,13 +276,13 @@ __rvm_parse_args() {
 
       --alias)
         if [[ -n "$1" ]]; then
-          export rvm_ruby_aliases="$(echo "$rvm_ruby_aliases $1" | \tr ',' ' ' | __rvm_strip)"
+          rvm_ruby_aliases="$(echo "${rvm_ruby_aliases//,/ } ${1//,/ }" | __rvm_strip)"
           shift
         fi
       ;;
 
       --symlink)
-        $rvm_scripts_path/log "warn" "--symlink has been removed, please see 'rvm wrapper'."
+        "$rvm_scripts_path/log" "warn" "--symlink has been removed, please see 'rvm wrapper'."
         shift
       ;;
 
@@ -297,27 +296,29 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      -h|--help|usage)      rvm_action=help                     ;;
       -G)                   path_variable="rvm_gems_path"     ; __rvm_set_path_variable "$1"; shift  ;;
       --source)             path_variable="rvm_src_path"      ; __rvm_set_path_variable "$1"; shift  ;;
       --archives)           path_variable="rvm_archives_path" ; __rvm_set_path_variable "$1"; shift  ;;
-      --make)               rvm_ruby_make="$1"         ; shift  ;;
-      --make-install)       rvm_ruby_make_install="$1" ; shift  ;;
-      --nice)               rvm_niceness="$1"          ; shift  ;;
-      -l|--level)           rvm_ruby_patch_level="p$1" ; shift  ;;
+      -h|--help|usage)      rvm_action=help                      ;;
+      --make)               rvm_ruby_make="$1"         ; shift   ;;
+      --make-install)       rvm_ruby_make_install="$1" ; shift   ;;
+      --nice)               rvm_niceness="$1"          ; shift   ;;
+      -l|--level)           rvm_ruby_patch_level="p$1" ; shift   ;;
       # TODO: handle this below better (if $1 is null)
-      --sdk)                rvm_sdk="$1"               ; shift  ;;
-      --archflags)          rvm_archflags="$1"         ; shift  ;;
-      --install)            rvm_install_on_use_flag=1    ;;
-      --trace)              rvm_trace_flag=1    ; set -x ;;
-      --proxy)              rvm_proxy="$1"      ; shift  ;;
-      --disable-llvm|--disable-jit) rvm_llvm_flag=0      ;;
-      --enable-llvm|--enable-jit)   rvm_llvm_flag=1      ;;
+      --sdk)                rvm_sdk="$1"               ; shift   ;;
+      --archflags)          rvm_archflags="$1"         ; shift   ;;
+      --install)            rvm_install_on_use_flag=1            ;;
+      --trace)              rvm_trace_flag=1    ; set -x         ;;
+      -q|--quiet)           rvm_quiet_flag=1                     ;;
+      -s|--silent)          rvm_silent_flag=1                    ;;
+      --proxy)              rvm_proxy="$1"      ; shift          ;;
+      --disable-llvm|--disable-jit) rvm_llvm_flag=0              ;;
+      --enable-llvm|--enable-jit)   rvm_llvm_flag=1              ;;
 
       reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--gems|--docs)
-        export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
+        export "rvm_${rvm_token//-/}_flag"=1
       ;;
 
       --dump-environment)
@@ -355,19 +356,10 @@ __rvm_parse_args() {
         fi
       ;;
 
-      --with-*)
-        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
-      ;;
-      --without-*)
-        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
-      ;;
-      --enable-*)
-        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
-      ;;
-      --disable-*)
-        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
-      ;;
-
+      --with-*)    rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
+      --without-*) rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
+      --enable-*)  rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
+      --disable-*) rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
 
       -I|--include)
         if [[ -z "$1" ]] ; then
@@ -384,42 +376,43 @@ __rvm_parse_args() {
       *)
         if [[ -n "$rvm_token" ]] ; then
           if [[ "gemset" = "$rvm_action" ]] ; then
-            if $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
-              rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
-              rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
-            elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
-              rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
+            if "$rvm_scripts_path/match" "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
+              rvm_gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
+              rvm_ruby_string="${rvm_token/${rvm_gemset_separator}*/}"
+            elif echo "$rvm_token" | \grep -q '.gems$' ; then
+              rvm_file_name="${rvm_token/.gems/}.gems" # Account for possible .gems.gems
               # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
             else
-              rvm_gemset_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
+              rvm_gemset_name="${rvm_token/.gems/}"
               rvm_file_name="$rvm_gemset_name.gems"
             fi
-          elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
+          elif echo "$rvm_token" | \grep -q ',' ; then
             rvm_ruby_strings="$rvm_token"
             if [[ -z "$rvm_action" ]] ; then
               rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
             fi
-          elif $rvm_scripts_path/match "$rvm_token" "^${rvm_gemset_separator}" ; then
+          elif "$rvm_scripts_path/match" "$rvm_token" "^${rvm_gemset_separator}" ; then
             rvm_action="use"
             rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
+            rvm_gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
             rvm_ruby_string="$(__rvm_environment_identifier | awk -F${rvm_gemset_separator} '{print $1}')"
             rvm_ruby_strings="${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
-          elif $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
+          elif "$rvm_scripts_path/match" "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
             rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
             rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
             rvm_ruby_strings="$rvm_token"
-          elif $rvm_scripts_path/match "$rvm_token" "^.+\\+.+$" ; then
-            rvm_ruby_alias="$(echo "$rvm_token" | awk -F+ '{print $2}')"
-            rvm_ruby_string="$(echo "$rvm_token" | awk -F+ '{print $1}')"
+          elif "$rvm_scripts_path/match" "$rvm_token" "^.+\\+.+$" ; then
+            rvm_ruby_alias="${rvm_token/*+/}"
+            rvm_ruby_string="${rvm_token/+*/}"
             rvm_ruby_strings="$rvm_ruby_string"
-          elif $rvm_scripts_path/match "$rvm_token" "-" ; then
+          elif "$rvm_scripts_path/match" "$rvm_token" "-" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
-          elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
+          elif "$rvm_scripts_path/match" "$rvm_token" "^[0-9].[0-9]" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
-          elif $rvm_scripts_path/match "$rvm_token" "^ree-" ; then
+          elif "$rvm_scripts_path/match" "$rvm_token" "^ree-" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
@@ -428,12 +421,10 @@ __rvm_parse_args() {
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
           else
-            if $rvm_scripts_path/match "$rvm_token" "\.rb$" ; then # we have a specified ruby script
+            if "$rvm_scripts_path/match" "$rvm_token" ".rb$" ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
-              if [[ -z "$rvm_action" ]] ; then
-                rvm_action="ruby"
-              fi
+              if [[ -z "$rvm_action" ]] ; then rvm_action="ruby" ; fi
             else
               rvm_action="error"
               rvm_error_message="Unrecognized command line argument: '$rvm_token'"
@@ -460,8 +451,8 @@ __rvm_parse_args() {
 rvm() {
   __rvm_setup
 
-  case $- in *i*) rvm_interactive=1 ;;
-              *) unset rvm_interactive ;;
+  case $- in *i*) rvm_interactive=1     ;;
+               *) unset rvm_interactive ;;
   esac ; export rvm_interactive
 
   if [[ -z "$ZSH_VERSION" ]] ; then
@@ -475,12 +466,13 @@ rvm() {
     return 1
   fi
 
-  __rvm_cleanup_variables
+  __rvm_cleanse_variables
   __rvm_load_rvmrc
   __rvm_initialize
   __rvm_parse_args "$@"
+
   export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments
-  export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
+  export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_ruby_aliases rvm_quiet_flag rvm_silent_flag
 
   result=0
 
@@ -497,44 +489,38 @@ rvm() {
     inspect)         __rvm_inspect           ; result=$? ;;
     implode|seppuku) __rvm_implode           ; result=$? ;;
 
-    list)            $rvm_scripts_path/list $rvm_ruby_args ; result=$? ;;
+    list)  "$rvm_scripts_path"/list $rvm_ruby_args ; result=$? ;;
     # TODO: Make debug run in the current environment.
-    debug)           $rvm_scripts_path/info '' debug ; result=$? ;;
+    debug) "$rvm_scripts_path"/info '' debug ; result=$? ;;
+    help)  "$rvm_scripts_path"/help $rvm_ruby_args ; result=$? ;;
+    env)   "$rvm_scripts_path"/env "$rvm_ruby_string" ; result=$?  ;;
     info)
-      if [[ "$1" == "info" ]]; then shift; fi
+      if [[ "$1" = "info" ]]; then shift; fi
       if [[ -z "$rvm_ruby_args" ]] ; then
-        $rvm_scripts_path/info
+        "$rvm_scripts_path/info"
       else
-        $rvm_scripts_path/info $rvm_ruby_args
+        "$rvm_scripts_path/info" $rvm_ruby_args
       fi
       result=$?
     ;;
-    help)            $rvm_scripts_path/help     $rvm_ruby_args ; result=$? ;;
 
-    answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
+    answer)   __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
     question) __rvm_ultimate_question ; result=42 ;;
 
-    env)
-      $rvm_scripts_path/env "$rvm_ruby_string"
-      result=$?
-    ;;
-
     wrapper)
-      $rvm_scripts_path/wrapper "$rvm_ruby_string" "$rvm_wrapper_name" $rvm_ruby_args
-      result=$?
-      unset rvm_wrapper_name
+      "$rvm_scripts_path/wrapper" "$rvm_ruby_string" "$rvm_wrapper_name" $rvm_ruby_args
+      result=$? ; unset rvm_wrapper_name
     ;;
 
     gemdir|gemhome|gempath)
-      $rvm_scripts_path/gemsets "$rvm_action"
-      result=$?
+      "$rvm_scripts_path/gemsets" "$rvm_action" ; result=$?
     ;;
 
     ruby|gem|rake|exec)
       old_rvm_ruby_string=$rvm_ruby_string
       unset rvm_ruby_string
       export rvm_ruby_strings
-      $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+      "$rvm_scripts_path/set" "$rvm_action" "$rvm_ruby_args"
       result=$?
       # Restore the state pre-sets.
       [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
@@ -542,17 +528,13 @@ rvm() {
     ;;
 
     cleanup|tools|snapshot|disk-usage|repair|alias|docs|rubygems|migrate|upgrade)
-      __rvm_run_script "$rvm_action"
-      result=$?
+      __rvm_run_script "$rvm_action" ; result=$?
     ;;
 
-    rvmrc)
-      eval "__rvm_rvmrc_tools $rvm_ruby_args"
-      result="$?"
-    ;;
+    rvmrc) eval "__rvm_rvmrc_tools $rvm_ruby_args" ; result="$?" ;;
 
     gemset)
-      #if $rvm_scripts_path/match $rvm_ruby_args use ; then
+      #if "$rvm_scripts_path/match" $rvm_ruby_args use ; then
       if [[ "$rvm_use_flag" -eq 1 ]] ; then
         __rvm_gemset_select
         result=$? ; if [[ $result -eq 0 ]] ; then
@@ -560,7 +542,7 @@ rvm() {
         fi
       else
         export rvm_ruby_strings
-        $rvm_scripts_path/gemsets $rvm_ruby_args
+        "$rvm_scripts_path"/gemsets $rvm_ruby_args
         unset rvm_ruby_strings
 
         # Clear the gemset.
@@ -580,35 +562,32 @@ rvm() {
 
     monitor)
       export rvm_ruby_strings rvm_ruby_string
-      $rvm_scripts_path/monitor ; result=$?
+      "$rvm_scripts_path"/monitor ; result=$?
     ;;
-    notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload)        unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
+
+    notes)       "$rvm_scripts_path"/notes   ; result=$?  ;;
+    reload)      unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
+    tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
+    package)     "$rvm_scripts_path"/package $rvm_ruby_args ; result=$?  ;;
 
     fetch|install|uninstall|remove)
       if [[ -n "$rvm_ruby_strings" ]]; then
-        $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_strings"
+        "$rvm_scripts_path"/manage "$rvm_action" "$rvm_ruby_strings"
       else
-        $rvm_scripts_path/manage "$rvm_action"
+        "$rvm_scripts_path"/manage "$rvm_action"
       fi
       result=$?
     ;;
-    tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
-
-    package)
-      $rvm_scripts_path/package $rvm_ruby_args
-      result=$?
-    ;;
 
     error)
-      $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+      "$rvm_scripts_path"/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop
       result=1
     ;;
 
     *)
       if [[ ! -z "$rvm_action" ]] ; then
-        $rvm_scripts_path/log "fail"  "unknown action '$rvm_action'"
+        "$rvm_scripts_path/log" "fail"  "unknown action '$rvm_action'"
       else
         __rvm_usage
       fi