rvm 1.0.1 → 1.0.2

data/scripts/match

@@ -3,3 +3,4 @@
 if [[ -z "$1" ]] || [[ -z "$2" ]] ; then exit 1 ; fi
 
 if [[ -n "$(echo "$1" |  awk "/${2}/")" ]] ; then exit 0 ; else exit 1 ; fi
+

data/scripts/migrate

@@ -14,16 +14,16 @@ confirm() {
   printf "$1 (Y/n): "
   local confirmation_response
   read -r confirmation_response
-  [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | grep -qi '^y'
+  [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | \grep -qi '^y'
 }
 
 die_with_error() {
-  $rvm_scripts_path/log "fail" "$1"
+  "$rvm_scripts_path/log" "fail" "$1"
   exit "${2:-1}"
 }
 
 expand_ruby_name() {
-  $rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
+  "$rvm_scripts_path/tools" strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
 }
 
 migrate_rubies() {
@@ -49,7 +49,7 @@ migrate_rubies() {
 
   while read -r origin_gemset; do
     [[ "$origin_gemset" = "$expanded_source" || "$origin_gemset" = "$expanded_source$rvm_gemset_separator"* ]] || continue
-    gemset_name="$(echo "$origin_gemset" | awk -F"$rvm_gemset_separator" '{print $2}')"
+    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"
@@ -64,21 +64,20 @@ migrate_rubies() {
     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")
+  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="$(echo "$alias_pair" | awk -F= '{print $2}')"
-      migrate_alias_name="$(echo "$alias_pair" | awk -F= '{print $1}')"
+      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
+        "$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
@@ -86,7 +85,7 @@ migrate_rubies() {
 
   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
+    for binary_name in $(\ls "$rvm_bin_path") ; do
       full_bin_path="$rvm_bin_path/$binary_name"
       [[ ! -L "$full_bin_path" ]] && continue
       expanded_symlink="$(readlink "$full_bin_path")"

data/scripts/monitor

@@ -58,11 +58,11 @@ while : ; do
         if [[ "spec" = "$framework" ]] ; then
           rvm_action="spec"
           rvm_ruby_args="spec/spec_helper.rb ${changed_spec_files[*]}"
-          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+          "$rvm_scripts_path/set" $rvm_action $rvm_ruby_args
         elif [[ "test" = "$framework" ]] ; then
           rvm_action="ruby"
           rvm_ruby_args=" -r$(echo "${changed_test_files[*]}" | sed 's/ / -r/g') test/test_helper.rb"
-          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+          "$rvm_scripts_path/set" $rvm_action $rvm_ruby_args
         fi
         update=1
       fi
@@ -73,11 +73,11 @@ while : ; do
         if [[ "spec" = "$framework" ]] ; then
           rvm_action="spec"
           rvm_ruby_args="spec/"
-          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+          "$rvm_scripts_path/set" $rvm_action $rvm_ruby_args
         elif [[ "test" = "$framework" ]] ; then
           rvm_action="rake"
           rvm_ruby_args="test"
-          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+          "$rvm_scripts_path/set" "$rvm_action" $rvm_ruby_args
         fi
         update=1
       fi

data/scripts/package

@@ -4,9 +4,9 @@ source "$rvm_scripts_path/base"
 
 # Tools to make managing ruby dependencies inside of rvm easier.
 
-action="$(echo "$*" | awk '{print $1}')"
-library="$(echo "$*" | awk '{print $2}')"
-args=$(echo "$*" | awk '{$1="" ; $2="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+action="$1" ; shift
+library="$1" ; shift
+args="$(echo $*) " # Strip trailing / leading / extra spacing.
 
 install_package() {
 
@@ -14,18 +14,18 @@ install_package() {
 
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
-  __rvm_pushpop $rvm_src_path
+  __rvm_pushpop "$rvm_src_path"
 
-  $rvm_scripts_path/log "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
+  "$rvm_scripts_path/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
 
   if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
-    $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+    "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
     __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
   elif [[ "$archive_format" = "tar.bz2" ]] ; then
-    $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+    "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
     __rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
   elif [[ "$archive_format" = "zip" ]] ; then
-    $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+    "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
     __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
   else
     printf "\nUnrecognized archive format '$archive_format'" ; return 1
@@ -45,7 +45,7 @@ install_package() {
   fi
 
   \touch "$rvm_config_path/packages"
-  $rvm_scripts_path/db "$rvm_config_path/packages" "${package}" "${version}"
+  "$rvm_scripts_path/db" "$rvm_config_path/packages" "${package}" "${version}"
 
   __rvm_pushpop
 }
@@ -72,10 +72,10 @@ openssl() {
   package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
     if [[ ! -z "$rvm_archflags" ]]; then
-      if $rvm_scripts_path/match "$rvm_archflags" "64"; then
+      if "$rvm_scripts_path/match" "$rvm_archflags" "64"; then
         hw_cpu64bit=1
       fi
-      if $rvm_scripts_path/match "$rvm_archflags" "ppc"; then
+      if "$rvm_scripts_path/match" "$rvm_archflags" "ppc"; then
         hw_machine="Power Macintosh"
       fi
     else
@@ -99,7 +99,7 @@ openssl() {
     patches="$rvm_patches_path/$package/Makefile.org.patch,$rvm_patches_path/$package/crypto-Makefile.patch"
     # Don't use -j option for make OpenSSL
     if [[ ! -z "$rvm_make_flags" ]] ; then
-      rvm_make_flags=$(echo $rvm_make_flags | sed -e "s/-j[[:space:]]*[[0-9]]*//")
+      rvm_make_flags=$(echo "$rvm_make_flags" | sed -e "s/-j[[:space:]]*[[0-9]]*//")
     fi
   else
     configure_command="./config"
@@ -181,10 +181,10 @@ 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."
+    "$rvm_scripts_path/log" "error" "Package '${library}' is unknown."
   fi
 else
-  $rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {readline,iconv,curl,openssl,zlib,autoconf,ncurses,pkgconfig,gettext,glib,mono,llvm,libxml2}'"
+  "$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
 fi
 

data/scripts/patches

@@ -5,7 +5,7 @@
 
 # Returns the path used to look for a patch given a specific name.
 __rvm_patch_lookup_path() {
-  echo "/" 
+  echo "/"
   [[ -n "$rvm_patch_original_pwd" ]] && echo "$rvm_patch_original_pwd/"
   echo "$PWD/"
   __rvm_ruby_string_paths_under "$rvm_patches_path" | sed 's/$/\//'
@@ -13,13 +13,12 @@ __rvm_patch_lookup_path() {
 
 __rvm_expand_patch_name() {
   [[ -z "$1" ]] && return
-  expanded_patch_name="$($rvm_scripts_path/patchsets show "$1")"
+  expanded_patch_name="$("$rvm_scripts_path/patchsets" show "$1")"
   if [[ "$?" == "0" ]]; then
     echo "$expanded_patch_name"
   elif [[ "$1" != "default" ]]; then
     echo "$1"
-  fi
-  unset expanded_patch_name
+  fi ; unset expanded_patch_name
 }
 
 # Return the full patch for a given patch.

data/scripts/repair

@@ -14,7 +14,7 @@ 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; unset executable_name
@@ -25,7 +25,7 @@ repair_symlinks() {
 repair_environments() {
   for environment_name in $(\ls "$rvm_environments_path"); 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
@@ -36,8 +36,8 @@ repair_archives() {
   for archive_file in $(\ls "$rvm_archives_path"); 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."
+    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"
     fi
   done; unset archive_file
@@ -47,7 +47,7 @@ repair_all() {
   repair_symlinks
   repair_archives
   repair_environments
-  $rvm_scripts_path/log "info" "All items repaired."
+  "$rvm_scripts_path/log" "info" "All items repaired."
 }
 
 if [[ -z "$1" ]]; then

data/scripts/rubygems

@@ -9,7 +9,7 @@ __rvm_become
 rubygems_setup() {
   __rvm_warn_on_rubyopt
   unset RUBYOPT
-  if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
+  if [[ ! -z "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     install=0
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
     install=0
@@ -20,17 +20,17 @@ rubygems_setup() {
   fi
 
   if [[ "$install" -eq 0 ]] ; then
-    $rvm_scripts_path/log "error" "Cannot switch to ${version} for this interpreter."
+    "$rvm_scripts_path/log" "error" "Cannot switch to ${version} for this interpreter."
     exit 1
   else
-    $rvm_scripts_path/log "info" "Removing old Rubygems files..."
+    "$rvm_scripts_path/log" "info" "Removing old Rubygems files..."
     rubygems_dir="$(ruby -rrbconfig -e "puts Config::CONFIG.values_at('sitelibdir','vendorlibdir').detect {|path| File.directory?(File.join(path, 'rubygems')) }.to_s")"
     if [[ -n "$rubygems_dir" && -d "$rubygems_dir" ]]; then
       # Remove common files installed by ruby gems.
       \rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
     fi
 
-    $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
+    "$rvm_scripts_path/log" "info" "Installing rubygems dedicated to $rvm_ruby_string..."
     rvm_rubygems_version="$version"
     rvm_gem_package_name="rubygems-$rvm_rubygems_version"
     rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")
@@ -43,10 +43,10 @@ rubygems_setup() {
     fi
 
     if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
-      $rvm_scripts_path/log "info" "Retrieving $rvm_gem_package_name"
-      $rvm_scripts_path/fetch "$rvm_gem_url"
+      "$rvm_scripts_path/log" "info" "Retrieving $rvm_gem_package_name"
+      "$rvm_scripts_path/fetch" "$rvm_gem_url"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
-        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+        "$rvm_scripts_path/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
       \mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "gunzip < $rvm_archives_path/$rvm_gem_package_name.tgz | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
@@ -57,9 +57,9 @@ rubygems_setup() {
     __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
     if [[ "$result" == 0 ]] ; then
-      $rvm_scripts_path/log "info" "Installation of rubygems completed successfully."
+      "$rvm_scripts_path/log" "info" "Installation of rubygems completed successfully."
     else
-      $rvm_scripts_path/log "warning" "Installation of rubygems did not complete successfully."
+      "$rvm_scripts_path/log" "warning" "Installation of rubygems did not complete successfully."
     fi
 
     if [[ ! -z "$rvm_major_version" ]] ; then
@@ -80,7 +80,7 @@ rubygems_setup() {
 }
 
 if ! command -v ruby > /dev/null ; then
-  $rvm_scripts_path/log "error" "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
+  "$rvm_scripts_path/log" "error" "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
   exit 1
 fi
 
@@ -91,7 +91,7 @@ if [[ $# -gt 0 ]] ; then
   version="$1" ; shift
   args="$(echo "$@" | __rvm_strip)"
 else
-  $rvm_scripts_path/log "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
+  "$rvm_scripts_path/log" "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
   exit 1
 fi
 

data/scripts/rvm

@@ -6,6 +6,7 @@
 
 rvm_reload_flag="${rvm_reload_flag:-0}"
 rvm_loaded_flag="${rvm_loaded_flag:-0}"
+
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
 
@@ -59,7 +60,6 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     source "$rvm_scripts_path/version"
     source "$rvm_scripts_path/selector"
     source "$rvm_scripts_path/cli"
-    source "$rvm_scripts_path/manpages"
     source "$rvm_scripts_path/cd"
     source "$rvm_scripts_path/override_gem"
 
@@ -74,10 +74,10 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
         source "$rvm_environments_path/default"
       fi
     fi
-    
+
     # Makes sure rvm_bin_path is in PATH atleast once.
     __rvm_conditionally_add_bin_path
-    
+
   else
     printf "\n\$rvm_path is not set. rvm cannot load."
   fi

data/scripts/rvm-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