rvm 1.0.1 → 1.0.2

data/scripts/selector

@@ -37,7 +37,7 @@ __rvm_select() {
 
         unset rvm_ruby_patch_level
       else
-        $rvm_scripts_path/log "fail" "MacRuby can only be installed on a Darwin OS."
+        "$rvm_scripts_path/log" "fail" "MacRuby can only be installed on a Darwin OS."
       fi
     ;;
 
@@ -131,8 +131,8 @@ __rvm_select() {
         fi
       fi
 
-      if ! $rvm_scripts_path/match "$rvm_ruby_version" "^1\.8" ; then
-        $rvm_scripts_path/log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
+      if ! "$rvm_scripts_path/match" "$rvm_ruby_version" "^1\.8" ; then
+        "$rvm_scripts_path/log" "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi
     ;;
 
@@ -148,7 +148,7 @@ __rvm_select() {
 
     ruby)
       if [[ -z "$rvm_ruby_version" && -z "$rvm_head_flag" ]]; then
-        $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version"
+        "$rvm_scripts_path/log" "fail" "Unknown ruby version: $rvm_ruby_version"
       else
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
         if [[ -z "$rvm_head_flag" ]]; then
@@ -159,7 +159,7 @@ __rvm_select() {
 
     current)
       ruby_binary="$(command -v ruby)"
-      if [[ $? -eq 0 ]] && $rvm_scripts_path/match "$ruby_binary" "rvm" ; then
+      if [[ $? -eq 0 ]] && "$rvm_scripts_path/match" "$ruby_binary" "rvm" ; then
         rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
       else
         rvm_ruby_interpreter="system"
@@ -176,7 +176,7 @@ __rvm_select() {
         __rvm_select
       else
         if [[ -z "$rvm_ruby_string" ]] ; then
-          $rvm_scripts_path/log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+          "$rvm_scripts_path/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
           return 1
         fi
       fi
@@ -186,9 +186,9 @@ __rvm_select() {
 
   if [[ -n "$rvm_ruby_interpreter" && "system" != "$rvm_ruby_interpreter" && "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ ! -z "$rvm_ruby_version" ]] ; then
-      rvm_release_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $1 }')
-      rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
-      rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
+      rvm_release_version="${rvm_ruby_version/.*/}"
+      rvm_major_version=${rvm_ruby_version%.*} ; rvm_major_version=${rvm_major_version#*.}
+      rvm_minor_version="${rvm_ruby_version//*.}"
     fi
 
     rvm_ruby_package_name="${rvm_ruby_package_name:-$(echo $rvm_ruby_string | sed -e 's/-n.*$//')}"
@@ -249,7 +249,7 @@ __rvm_use() {
     fi
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      $rvm_scripts_path/log "info" "Now using system ruby."
+      "$rvm_scripts_path/log" "info" "Now using system ruby."
     fi
 
     export rvm_ruby_string="system"
@@ -267,11 +267,11 @@ __rvm_use() {
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
     if [[ ! -d $MY_RUBY_HOME ]] ; then
-      $rvm_scripts_path/log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
+      "$rvm_scripts_path/log" "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
       if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
-        $rvm_scripts_path/manage "install" "$rvm_ruby_string"
+        "$rvm_scripts_path/manage" "install" "$rvm_ruby_string"
       else
-        $rvm_scripts_path/log "info" "To install do: 'rvm install $rvm_ruby_string'"
+        "$rvm_scripts_path/log" "info" "To install do: 'rvm install $rvm_ruby_string'"
         return 1
       fi
     fi
@@ -280,7 +280,7 @@ __rvm_use() {
     __rvm_ensure_has_environment_files
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
+      "$rvm_scripts_path/log" "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
     fi
 
     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)"
@@ -301,35 +301,35 @@ __rvm_use() {
   if [[ -n "$rvm_default_flag" && "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ "$rvm_selfcontained" = "0" ]] ; then
       # Sets up the default wrappers.
-      $rvm_scripts_path/wrapper "$rvm_ruby_string" --no-prefix
+      "$rvm_scripts_path/wrapper" "$rvm_ruby_string" --no-prefix
     else
-      $rvm_scripts_path/wrapper "$rvm_scripts_path" "default"
+      "$rvm_scripts_path/wrapper" "$rvm_scripts_path" "default"
     fi
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-      $rvm_scripts_path/alias delete default &> /dev/null
+      "$rvm_scripts_path/alias" delete default &> /dev/null
       \find "$rvm_bin_path" -name 'default_*' -maxdepth 1 -delete
-      \rm -f $rvm_config_path/default
-      \rm -f $rvm_environments_path/default
-      \rm -rf $rvm_wrappers_path/default
+      \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#')"
+      RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
-      $rvm_scripts_path/alias delete default &> /dev/null
-      $rvm_scripts_path/alias create default "$environment_id" >& /dev/null
-      ln -nfs $rvm_environments_path/$environment_id $rvm_environments_path/default
-      ln -nfs $rvm_wrappers_path/$environment_id $rvm_wrappers_path/default
+      "$rvm_scripts_path/alias" delete default &> /dev/null
+      "$rvm_scripts_path/alias" create default "$environment_id" >& /dev/null
+      ln -nfs "$rvm_environments_path/$environment_id" "$rvm_environments_path/default"
+      ln -nfs "$rvm_wrappers_path/$environment_id" "$rvm_wrappers_path/default"
     fi
   fi ; unset rvm_default_flag
 
   if [[ -n "$rvm_wrapper_name" ]] ; then
-    $rvm_scripts_path/wrapper "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
+    "$rvm_scripts_path/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
     unset rvm_wrapper_name
   fi
 
   if [[ -n "$rvm_ruby_alias" ]]; then
-    $rvm_scripts_path/log "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
-    $rvm_scripts_path/alias delete "$rvm_ruby_alias" > /dev/null 2>&1
-    rvm_alias_expanded=1 $rvm_scripts_path/alias create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
+    "$rvm_scripts_path/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
+    "$rvm_scripts_path/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
+    rvm_alias_expanded=1 "$rvm_scripts_path/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
     unset ruby_alias rvm_ruby_alias
   fi
 
@@ -339,11 +339,11 @@ __rvm_use() {
     export MAGLEV_HOME="$rvm_ruby_home"
     export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
     if [[ -x "$MAGLEV_HOME/gemstone/bin/gslist" ]] ; then
-      $MAGLEV_HOME/gemstone/bin/gslist -clv > /dev/null 2>&1 ; result=$?
-      if [[ $result -eq 1 ]] ; then $rvm_ruby_home/bin/maglev start ; fi
+      "$MAGLEV_HOME/gemstone/bin/gslist" -clv > /dev/null 2>&1 ; result=$?
+      if [[ $result -eq 1 ]] ; then "$rvm_ruby_home/bin/maglev" start ; fi
     fi
   fi
-  rvm_hook="after_use" ; source $rvm_scripts_path/hook
+  rvm_hook="after_use" ; source "$rvm_scripts_path/hook"
 }
 
 __rvm_ruby_string() {
@@ -355,6 +355,13 @@ __rvm_ruby_string() {
   # * rvm_ruby_revision
   # * rvm_ruby_tag
 
+  if printf "$rvm_ruby_string" | \grep -q "$rvm_gemset_separator" ; then
+    set_name="${rvm_ruby_string/*${rvm_gemset_separator}/}"
+  else
+    set_name=""
+  fi
+  if [[ -n "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi
+
   # Alias'd rubies
   if [[ -z "$rvm_expanding_aliases" ]]; then
     rvm_ruby_string="${rvm_ruby_string:-"default"}"
@@ -366,14 +373,11 @@ __rvm_ruby_string() {
       rvm_ruby_string="system"
     fi
   fi
-
-  set_name=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $2}')
-  if [[ ! -z "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi
-  ruby_string=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $1}')
+  ruby_string=${rvm_ruby_string/${rvm_gemset_separator}*/}
 
   __rvm_unset_ruby_variables
 
-  for string in $(echo $ruby_string | \tr '-' ' ') ; do
+  for string in $(printf "${ruby_string//-/ }") ; do
     if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
@@ -386,16 +390,16 @@ __rvm_ruby_string() {
       rvm_ruby_version="nightly"
       rvm_nightly_flag=1
       break
-    elif $rvm_scripts_path/match "$string" "^preview" ; then
+    elif "$rvm_scripts_path/match" "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
-    elif $rvm_scripts_path/match "$string" "^rc[0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^rc[0-9]" ; then
       rvm_ruby_patch_level="$string"
-    elif $rvm_scripts_path/match "$string" "^[0-9]\.[0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^[0-9]\.[0-9]" ; then
       rvm_ruby_version="$string"
       unset rvm_ruby_revision rvm_ruby_tag
-    elif $rvm_scripts_path/match "$string" "^p[0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^p[0-9]" ; then
       rvm_ruby_patch_level="$string"
-    elif [[ -n "$rvm_ruby_version" ]] && $rvm_scripts_path/match "$string" "^[0-9][0-9]" ; then
+    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"
         unset rvm_ruby_revision
@@ -407,40 +411,40 @@ __rvm_ruby_string() {
       else
         rvm_ruby_revision="r$string"
       fi
-    elif $rvm_scripts_path/match "$string" "^r[0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^r[0-9]" ; then
       unset rvm_ruby_patch_level
       rvm_ruby_revision="$string"
-    elif $rvm_scripts_path/match "$string" "^s[0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^s[0-9]" ; then
       unset rvm_ruby_revision
       rvm_ruby_sha="$string"
-    elif $rvm_scripts_path/match "$string" "^t[v0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^t[v0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision
       rvm_ruby_tag="$string"
-    elif $rvm_scripts_path/match "$string" "^m[0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^m[0-9]" ; then
       rvm_ruby_mode="$string"
-    elif $rvm_scripts_path/match "$string" "^u[a-z0-9]" ; then
+    elif "$rvm_scripts_path/match" "$string" "^u[a-z0-9]" ; then
       unset 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
+    elif "$rvm_scripts_path/match" "$string" "^b[0-9][0-9]" ; then
       rvm_ruby_bits="$string"
-    elif $rvm_scripts_path/match "$string" "^n" ; then
+    elif "$rvm_scripts_path/match" "$string" "^n" ; then
       rvm_ruby_name="${string/n/}"
-    elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby " "$string " ; then
+    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.
       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
   done
 
   # Unspecified interpreter
   if [[ -z "$rvm_ruby_interpreter" ]] ; then
-    if $rvm_scripts_path/match "$rvm_ruby_version" "^1\.[8-9]" ; 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
+    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
+    elif "$rvm_scripts_path/match" "$rvm_ruby_version" "^1.[2-4]" ; then
       rvm_ruby_interpreter="jruby"
     fi
   fi
@@ -513,7 +517,7 @@ __rvm_gemset_select() {
       fi
     fi
 
-    if [[ -n "$rvm_gemset_name" ]] && ! $rvm_scripts_path/match "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
+    if [[ -n "$rvm_gemset_name" ]] && ! "$rvm_scripts_path/match" "$rvm_gemset_name" "^[0-9]\.[0-9]" ; 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
@@ -540,7 +544,7 @@ __rvm_gemset_select() {
         rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
       fi ; unset gemset
     else
-      $rvm_scripts_path/log "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
+      "$rvm_scripts_path/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
       return 1
     fi
   fi
@@ -548,7 +552,7 @@ __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" -ne 1 ]] && [[ "$rvm_create_flag" -ne 1 ]] && [[ "$rvm_delete_flag" -ne 1 ]] ; then
-      $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+      "$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" -eq 1 ]] ; then
@@ -580,21 +584,21 @@ __rvm_gemset_use() {
   if [[ -n "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
       if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then
-        $rvm_scripts_path/gemsets create $rvm_gemset_name
+        "$rvm_scripts_path/gemsets" create "$rvm_gemset_name"
       else
-        $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+        "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
         return 1
       fi
     fi
 
     if [[ "$rvm_interactive" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
-      $rvm_scripts_path/log "info" "Now using gemset '${rvm_gemset_name:-default}'"
+      "$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="$(echo "$GEM_HOME" | sed 's/'${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"
+    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global/bin"
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
 
     __rvm_use # Now ensure the selection takes effect for the environment.
@@ -604,8 +608,8 @@ __rvm_gemset_use() {
 
 __rvm_gemset_clear() {
   unset rvm_gemset_name ; shift
-  rvm_ruby_gem_home="$(echo $GEM_HOME | sed "s#${rvm_gemset_separator:-'@'}.*\$##g")"
-  rvm_ruby_global_gems_path="$(echo $GEM_HOME | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global"
+  rvm_ruby_gem_home="$(echo "$GEM_HOME" | sed "s#${rvm_gemset_separator:-'@'}.*\$##g")"
+  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"
   GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"

data/scripts/set

@@ -3,7 +3,7 @@
 source "$rvm_scripts_path/base"
 
 if [[ -z "$1" ]] ; then
-  $rvm_scripts_path/log "error" "Action must be specified."
+  "$rvm_scripts_path/log" "error" "Action must be specified."
   exit 1
 fi
 
@@ -35,7 +35,7 @@ __rvm_ruby_do() {
     elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(command -v $binary)" ]] ; then
       binary="$(basename $(command -v $binary) 2>/dev/null)"
     else
-      $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+      "$rvm_scripts_path/log" "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
       __rvm_unset_ruby_variables
       return 1
     fi
@@ -48,9 +48,9 @@ __rvm_ruby_do() {
     load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
     # TODO: the else case below should be run if $args =~ /\.rb$/
     if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
-      if $rvm_scripts_path/match "$args" "\.rb$" ; then
+      if "$rvm_scripts_path/match" "$args" "\.rb$" ; then
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
-        if ! $rvm_scripts_path/match "$args" "$prefix" ; then
+        if ! "$rvm_scripts_path/match" "$args" "$prefix" ; then
           args="$prefix $args"
         fi
       fi
@@ -70,7 +70,7 @@ __rvm_ruby_do() {
       if [[ "$current_env" != "$current_set_ruby" ]]; then
         current_env="$current_set_ruby ($current_env)"
       fi
-      $rvm_scripts_path/log "info" "$current_env: $(ruby -v $rvm_ruby_mode | \tr "\n" ' ')\n"
+      "$rvm_scripts_path/log" "info" "$current_env: $(ruby -v $rvm_ruby_mode | \tr "\n" ' ')\n"
       unset current_env
     fi
     eval "$rvm_command"
@@ -117,7 +117,7 @@ __rvm_yaml() {
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
     if [[ ! -z "$rvm_debug_flag" ]] ; then
-      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+      "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
     fi
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
@@ -139,7 +139,7 @@ __rvm_json() {
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
     if [[ ! -z "$rvm_debug_flag" ]] ; then
-      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+      "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
     fi
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
@@ -163,8 +163,8 @@ action="$1";
 args="$*"
 
 if [[ "$action" == "ruby" ]] && echo "$args" | \grep -q  "^'--[^[:space:]]*'$" ; then
-  $rvm_scripts_path/log "warn" "You called rvm ruby with the arguments $args which look like use options."
-  $rvm_scripts_path/log "warn" "Please note that 'rvm ruby' invokes set operations instead."
+  "$rvm_scripts_path/log" "warn" "You called rvm ruby with the arguments $args which look like use options."
+  "$rvm_scripts_path/log" "warn" "Please note that 'rvm ruby' invokes set operations instead."
 fi
 
 rvm_ruby_strings="$(__rvm_expand_ruby_string "$rvm_ruby_strings")"
@@ -180,6 +180,6 @@ if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
 if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi
 if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
 
-rvm_hook="after_do" ; source $rvm_scripts_path/hook
+rvm_hook="after_do" ; source "$rvm_scripts_path/hook"
 
 exit ${#errors[*]}

data/scripts/snapshot

@@ -7,7 +7,7 @@ source "$rvm_scripts_path/base"
 
 __error_on_result() {
   if [[ "$1" -gt 0 ]]; then
-    $rvm_scripts_path/log "fail" "$2 - Aborting now."
+    "$rvm_scripts_path/log" "fail" "$2 - Aborting now."
     return 0
   else
     return 1
@@ -27,23 +27,23 @@ snapshot_save() {
   \rm -rf "$snapshot_temp_path"
   \mkdir -p "$snapshot_temp_path"
 
-  $rvm_scripts_path/log "info" "Backing up a list of aliases"
+  "$rvm_scripts_path/log" "info" "Backing up a list of aliases"
   \cp "$rvm_config_path/alias" "$snapshot_temp_path/"
 
-  $rvm_scripts_path/log "info" "Backing up your user preferences"
+  "$rvm_scripts_path/log" "info" "Backing up your user preferences"
   \cp "$rvm_config_path/user" "$snapshot_temp_path/"
 
-  $rvm_scripts_path/log "info" "Backing up your installed packages"
+  "$rvm_scripts_path/log" "info" "Backing up your installed packages"
   sed -e 's/-//' -e 's/^lib//' < "$rvm_config_path/packages" | awk -F= '{print $1}' | sort | uniq > "$snapshot_temp_path/packages"
 
-  $rvm_scripts_path/log "info" "Backing up all of your gemsets"
+  "$rvm_scripts_path/log" "info" "Backing up all of your gemsets"
   \mkdir -p "$snapshot_temp_path/gems"
   __rvm_pushpop "$snapshot_temp_path/gems"
-  for snapshot_gemset in $($rvm_scripts_path/list gemsets strings) ; do
+  for snapshot_gemset in $("$rvm_scripts_path/list" gemsets strings) ; do
     __rvm_become "$snapshot_gemset"
     result="$?"
     __error_on_result "$result" "Error becoming ruby $snapshot_gemset" && return "$result"
-    $rvm_scripts_path/gemsets export "${snapshot_gemset}.gems" >/dev/null
+    "$rvm_scripts_path/gemsets" export "${snapshot_gemset}.gems" >/dev/null
     result="$?"
     __error_on_result "$result" "Error exporting gemset contents for $snapshot_gemset" && return "$result"
     \mkdir -p "./$snapshot_gemset/"
@@ -51,15 +51,15 @@ snapshot_save() {
   done; unset snapshot_gemset
   __rvm_pushpop
 
-  $rvm_scripts_path/log "info" "Backing up all of your installed rubies"
+  "$rvm_scripts_path/log" "info" "Backing up all of your installed rubies"
   echo '#!/usr/bin/env bash -e' > "$snapshot_temp_path/install-rubies.sh"
   echo "source \"\$rvm_scripts_path/rvm\" || true" >> "$snapshot_temp_path/install-rubies.sh"
   local snapshot_ruby_name_file="$rvm_tmp_path/$$-rubies"
   local snapshot_alias_name_file="$rvm_tmp_path/$$-aliases"
   local snapshot_installable_file="$rvm_tmp_path/$$-installable"
 
-  $rvm_scripts_path/alias list | awk -F ' => ' '{print $1}' | sort | uniq 2>/dev/null > "$snapshot_alias_name_file"
-  $rvm_scripts_path/list strings | \tr ' ' '\n' | sort | uniq > "$snapshot_ruby_name_file"
+  "$rvm_scripts_path/alias" list | awk -F ' => ' '{print $1}' | sort | uniq 2>/dev/null > "$snapshot_alias_name_file"
+  "$rvm_scripts_path/list" strings | \tr ' ' '\n' | sort | uniq > "$snapshot_ruby_name_file"
   comm -2 -3 "$snapshot_ruby_name_file" "$snapshot_alias_name_file" > "$snapshot_installable_file"
   \rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_file"
 
@@ -78,7 +78,7 @@ snapshot_save() {
 
   \rm -rf "$snapshot_installable_file"
 
-  $rvm_scripts_path/log "info" "Compressing snapshotting"
+  "$rvm_scripts_path/log" "info" "Compressing snapshotting"
   local destination_path="$PWD"
   __rvm_pushpop "$snapshot_temp_path"
   \rm -rf "$destination_path/$1.tar.gz"
@@ -87,11 +87,10 @@ snapshot_save() {
   __error_on_result "$result" "Error creating archive $destination_path/$1.tar.gz" && return "$result"
   __rvm_pushpop
 
-  $rvm_scripts_path/log "info" "Cleaning up"
+  "$rvm_scripts_path/log" "info" "Cleaning up"
   \rm -rf "$snapshot_temp_path"
 
-  $rvm_scripts_path/log "info" "Snapshot complete"
-
+  "$rvm_scripts_path/log" "info" "Snapshot complete"
 }
 
 snapshot_load() {
@@ -113,31 +112,31 @@ snapshot_load() {
   \rm -rf "$snapshot_temp_path"
   \mkdir -p "$snapshot_temp_path"
 
-  $rvm_scripts_path/log "info" "Extracting snapshot"
+  "$rvm_scripts_path/log" "info" "Extracting snapshot"
   __rvm_pushpop "$snapshot_temp_path"
   tar xzf "$snapshot_archive"
   result="$?"
   __error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
   __rvm_pushpop
 
-  $rvm_scripts_path/log "info" "Restoring user settings"
+  "$rvm_scripts_path/log" "info" "Restoring user settings"
   \cp -f "$snapshot_temp_path/user" "$rvm_config_path/user"
 
-  $rvm_scripts_path/log "info" "Installing rvm-managed packages"
+  "$rvm_scripts_path/log" "info" "Installing rvm-managed packages"
   for snapshot_package in $(cat "$snapshot_temp_path/packages"); do
-    $rvm_scripts_path/package install "$snapshot_package"
+    "$rvm_scripts_path/package" install "$snapshot_package"
     result="$?"
     __error_on_result "$result" "Error installing package '$snapshot_package'" && return "$result"
   done; unset snapshot_package
 
-  $rvm_scripts_path/log "info" "Installing rubies"
+  "$rvm_scripts_path/log" "info" "Installing rubies"
   chmod +x "$snapshot_temp_path/install-rubies.sh"
-  $snapshot_temp_path/install-rubies.sh
+  "$snapshot_temp_path/install-rubies.sh"
   result="$?"
   __error_on_result "$result" "Error importing rubies." && return "$result"
 
   export rvm_create_flag=1
-  $rvm_scripts_path/log "info" "Setting up gemsets"
+  "$rvm_scripts_path/log" "info" "Setting up gemsets"
   __rvm_pushpop "$snapshot_temp_path/gems"
   for snapshot_gemset in $(\ls | \grep '\.gems$' | sed 's/.gems$//'); do
     __rvm_become "$snapshot_gemset"
@@ -147,17 +146,19 @@ snapshot_load() {
     \cp -Rf "$snapshot_gemset/" "$GEM_HOME/cache/"
     result="$?"
     __error_on_result "$result" "Error copying across cache for $snapshot_gemset" && return "$result"
-    $rvm_scripts_path/gemsets import "$snapshot_gemset" >/dev/null 2>&1
+    "$rvm_scripts_path/gemsets" import "$snapshot_gemset" >/dev/null 2>&1
     result="$?"
     __error_on_result "$result" "Error importing gemset for $snapshot_gemset" && return "$result"
   done; unset snapshot_gemset
   __rvm_pushpop
 
-  $rvm_scripts_path/log "info" "Restoring aliases"
+  "$rvm_scripts_path/log" "info" "Restoring aliases"
   while read -r package_info; do
-    local alias_name="$(echo "$package_info" | awk -F= '{print $1}')"
-    local alias_ruby="$(echo "$package_info" | awk -F= '{print $2}')"
-    $rvm_scripts_path/alias create "$alias_name" "$alias_ruby"
+    # Note: this assumes an '=' int the input...
+    local alias_name="${package_info/=*}"
+    local alias_ruby="${package_info/*=}"
+
+    "$rvm_scripts_path/alias" create "$alias_name" "$alias_ruby"
     if [[ "$alias_name" = "default" ]]; then
       (source "$rvm_scripts_path/rvm" && rvm use "$alias_ruby" --default) >/dev/null 2>&1
       result="$?"
@@ -166,10 +167,10 @@ snapshot_load() {
   done < "$snapshot_temp_path/alias"
   unset package_info
 
-  $rvm_scripts_path/log "info" "Cleaning up load process"
+  "$rvm_scripts_path/log" "info" "Cleaning up load process"
   \rm -rf "$snapshot_temp_path"
 
-  $rvm_scripts_path/log "info" "Loaded snapshot from $(basename "$snapshot_archive")"
+  "$rvm_scripts_path/log" "info" "Loaded snapshot from $(basename "$snapshot_archive")"
 }
 
 snapshot_usage() {