rvm 1.0.6 → 1.0.7

data/scripts/set

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 __rvm_attempt_single_exec() {
   # Return if we have multiple rubies. or we're not running exec.
@@ -37,7 +37,7 @@ __rvm_ruby_do() {
       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_path/scripts/log" "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
       __rvm_unset_ruby_variables
       return 1
     fi
@@ -51,11 +51,11 @@ __rvm_ruby_do() {
     # 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_path/scripts/match" "$args" "\.rb$" ; then
 
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
 
-        if ! "$rvm_scripts_path/match" "$args" "$prefix" ; then
+        if ! "$rvm_path/scripts/match" "$args" "$prefix" ; then
           args="$prefix $args"
         fi
       fi
@@ -76,7 +76,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_path/scripts/log" "info" "$current_env: $(ruby -v $rvm_ruby_mode | \tr "\n" ' ')\n"
       unset current_env
     fi
     eval "$rvm_command"
@@ -126,7 +126,7 @@ __rvm_yaml() {
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
     if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
+      "$rvm_path/scripts/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
     fi
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
@@ -149,7 +149,7 @@ __rvm_json() {
 
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
     if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
+      "$rvm_path/scripts/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
     fi
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
@@ -172,13 +172,13 @@ action="${args[0]}"
 args=${args[@]:1}
 
 if [[ -z "$action" ]] ; then
-  "$rvm_scripts_path/log" "error" "Action must be specified."
+  "$rvm_path/scripts/log" "error" "Action must be specified."
   exit 1
 fi
 
 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_path/scripts/log" "warn" "You called rvm ruby with the arguments $args which look like use options."
+  "$rvm_path/scripts/log" "warn" "Please note that 'rvm ruby' invokes set operations instead."
 fi
 
 rvm_ruby_strings=$(__rvm_expand_ruby_string "$rvm_ruby_strings")
@@ -195,6 +195,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_path/scripts/hook"
 
 exit ${#errors[*]}

data/scripts/snapshot

@@ -3,11 +3,11 @@
 unset GREP_COLOR
 unset GREP_OPTIONS
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 __error_on_result() {
   if [[ "$1" -gt 0 ]]; then
-    "$rvm_scripts_path/log" "fail" "$2 - Aborting now."
+    "$rvm_path/scripts/log" "fail" "$2 - Aborting now."
     return 0
   else
     return 1
@@ -27,41 +27,47 @@ snapshot_save() {
   \rm -rf "$snapshot_temp_path"
   \mkdir -p "$snapshot_temp_path"
 
-  "$rvm_scripts_path/log" "info" "Backing up a list of aliases"
+  "$rvm_path/scripts/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_path/scripts/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_path/scripts/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_path/scripts/log" "info" "Backing up all of your gemsets"
   \mkdir -p "$snapshot_temp_path/gems"
 
   (
     builtin cd "$snapshot_temp_path/gems"
-    for snapshot_gemset in $("$rvm_scripts_path/list" gemsets strings) ; do
-      __rvm_become "$snapshot_gemset"
-      result="$?"
+
+    for snapshot_gemset in $("$rvm_path/scripts/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
-      result="$?"
+
+      "$rvm_path/scripts/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/"
+
       [[ -d "$GEM_HOME/cache/" ]] && \cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
-    done; unset snapshot_gemset
+
+    done
   )
 
-  "$rvm_scripts_path/log" "info" "Backing up all of your installed rubies"
+  "$rvm_path/scripts/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"
+  echo "source \"\$rvm_path/scripts/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_path/scripts/alias" list | awk -F ' => ' '{print $1}' | sort | uniq 2>/dev/null > "$snapshot_alias_name_file"
+  "$rvm_path/scripts/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"
 
@@ -80,7 +86,7 @@ snapshot_save() {
 
   \rm -rf "$snapshot_installable_file"
 
-  "$rvm_scripts_path/log" "info" "Compressing snapshotting"
+  "$rvm_path/scripts/log" "info" "Compressing snapshotting"
   local destination_path="$PWD"
   (
     builtin cd "$snapshot_temp_path"
@@ -90,10 +96,10 @@ snapshot_save() {
     __error_on_result "$result" "Error creating archive $destination_path/$1.tar.gz" && return "$result"
   )
 
-  "$rvm_scripts_path/log" "info" "Cleaning up"
+  "$rvm_path/scripts/log" "info" "Cleaning up"
   \rm -rf "$snapshot_temp_path"
 
-  "$rvm_scripts_path/log" "info" "Snapshot complete"
+  "$rvm_path/scripts/log" "info" "Snapshot complete"
 }
 
 snapshot_load() {
@@ -115,7 +121,7 @@ snapshot_load() {
   \rm -rf "$snapshot_temp_path"
   \mkdir -p "$snapshot_temp_path"
 
-  "$rvm_scripts_path/log" "info" "Extracting snapshot"
+  "$rvm_path/scripts/log" "info" "Extracting snapshot"
   (
     builtin cd "$snapshot_temp_path"
     tar xzf "$snapshot_archive"
@@ -123,59 +129,72 @@ snapshot_load() {
     __error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
   )
 
-  "$rvm_scripts_path/log" "info" "Restoring user settings"
+  "$rvm_path/scripts/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_path/scripts/log" "info" "Installing rvm-managed packages"
   for snapshot_package in $(cat "$snapshot_temp_path/packages"); do
-    "$rvm_scripts_path/package" install "$snapshot_package"
+    "$rvm_path/scripts/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_path/scripts/log" "info" "Installing rubies"
   chmod +x "$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_path/scripts/log" "info" "Setting up gemsets"
   (
     builtin cd "$snapshot_temp_path/gems"
-    for snapshot_gemset in $(find * -iname '*.gems' -type f -maxdepth 0 | sed 's/.gems$//'); do
+
+    gems=($(find . -mindepth 0 -maxdepth 0 -type f -iname '*.gems' | sed 's/.gems$//'))
+
+    for snapshot_gemset in "${gems[@]//.\/}" ; do
+
       __rvm_become "$snapshot_gemset"
       result="$?"
-      __error_on_result "$result" "Error becoming '$snapshot_gemset'" && return "$result"
+
+      __error_on_result "$result" \
+        "Error becoming '$snapshot_gemset'" && return "$result"
+
       mkdir -p "$GEM_HOME/cache/"
+
       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
+
+      __error_on_result "$result" \
+        "Error copying across cache for $snapshot_gemset" && return "$result"
+
+      "$rvm_path/scripts/gemsets" import "$snapshot_gemset" >/dev/null 2>&1
       result="$?"
-      __error_on_result "$result" "Error importing gemset for $snapshot_gemset" && return "$result"
+
+      __error_on_result "$result" \
+        "Error importing gemset for $snapshot_gemset" && return "$result"
     done
   )
 
-  "$rvm_scripts_path/log" "info" "Restoring aliases"
+  "$rvm_path/scripts/log" "info" "Restoring aliases"
   while read -r package_info; do
     # 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"
+    "$rvm_path/scripts/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
+      (source "$rvm_path/scripts/rvm" && rvm use "$alias_ruby" --default) >/dev/null 2>&1
       result="$?"
       __error_on_result "$result" "Error setting default to $alias_ruby" && return "$result"
     fi
   done < "$snapshot_temp_path/alias"
   unset package_info
 
-  "$rvm_scripts_path/log" "info" "Cleaning up load process"
+  "$rvm_path/scripts/log" "info" "Cleaning up load process"
   \rm -rf "$snapshot_temp_path"
 
-  "$rvm_scripts_path/log" "info" "Loaded snapshot from $(basename "$snapshot_archive")"
+  "$rvm_path/scripts/log" "info" "Loaded snapshot from $(basename "$snapshot_archive")"
 }
 
 snapshot_usage() {

data/scripts/tools

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 usage() {
   echo "Usage: rvm tools {identifier,path-identifier,strings}" 1>&2
@@ -18,7 +18,7 @@ tools_path_identifier() {
     return 1
   fi
 
-  source "$rvm_scripts_path/rvm"
+  source "$rvm_path/scripts/rvm"
   builtin cd "$1"
   rvm_promptless=1 __rvm_project_rvmrc
   rvmrc_result="$?"

data/scripts/update

@@ -126,7 +126,7 @@ Be sure to get head often as rvm development happens fast,
 you can do this by running 'rvm update --head' followed by 'rvm reload'
 or opening a new shell
 
-  w⦿‿⦿$
+  w⦿‿⦿t
 
     ~ Wayne
 
@@ -145,7 +145,7 @@ Upgrade Notes
     rvm remove X ; rvm install X
 
   * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
-    export rvm_pretty_print=1
+    export rvm_pretty_print_flag=1
 "
 }
 
@@ -192,6 +192,7 @@ __rvm_initialize
 item="* "
 question="\n<?>"
 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"}"
@@ -209,13 +210,10 @@ fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 
-export rvm_gemset_separator="@" # TODO: Remove this after a while.
-
 printf "
   RVM:  Shell scripts enabling management of multiple ruby environments.
   RTFM: http://rvm.beginrescueend.com/
@@ -223,35 +221,60 @@ printf "
 "
 
 if [[ ${upgrade_flag:-0} -eq 1 ]] ;then
+
   printf "\nUpgrading the RVM installation in $rvm_path/"
+
 else
-  printf "\nInstalling rvm to $rvm_path/"
+
+  printf "\nInstalling RVM to $rvm_path/"
+
 fi
 
-mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
+for directory in "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path" ; do
+
+  if [[ ! -d "$directory" ]] ; then
+
+    mkdir -p "$directory"
+
+  fi
+
+done
 
 for file in README LICENCE ; do
+
   cp -f "$source_path/$file" "$rvm_path/"
+
 done
 
 #
 # Scripts
 #
 for dir_name in config scripts examples lib hooks help patches; do
-  mkdir -p "$rvm_path/$dir_name"
+
   if [[ -d "$source_path/$dir_name" ]] ; then
+
+    if [[ ! -d "$rvm_path/$dir_name" ]] ; then
+
+      mkdir -p "$rvm_path/$dir_name"
+
+    fi
+
     cp -Rf "$source_path/$dir_name" "$rvm_path"
+
   fi
-done ; unset dir_name
+
+done
 
 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"
 fi
 
-scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
+scripts=(monitor match log install color db fetch log set package)
+
 for script_name in "${scripts[@]}" ; do
-  chmod +x "$rvm_scripts_path/$script_name" 2>/dev/null # Hide errors.
+
+  chmod +x "$rvm_path/scripts/$script_name" 2>/dev/null # Hide errors.
+
 done
 
 #
@@ -259,29 +282,48 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
+
   rm -f "$rvm_bin_path/$file"
+
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+
 done
-chmod +x "$rvm_bin_path"/*
+
+chmod +x "$rvm_bin_path"/* # TODO: this is quite suboptimal.
 
 #
 # RC Files
 #
 if [[ -n "$rvm_auto_flag" ]] ; then
+
   printf "Checking rc files... ($rvm_rc_files)"
+
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
+
     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"
+
         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"
+
+        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+
+        printf "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> "$rcfile"
+
       fi
+
     done
   fi
 fi
@@ -290,47 +332,91 @@ fi
 # Initial Interpreter Gemsets.
 #
 if [[ -d gemsets/ ]] ; then
-  mkdir -p "$rvm_gemsets_path"
+
+  if [[ ! -d "$rvm_path/gemsets" ]] ; then
+
+    mkdir -p "$rvm_path/gemsets"
+
+  fi
 
   for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
-    destination="$rvm_gemsets_path/$gemset_file"
+
+    destination="$rvm_path/gemsets/$gemset_file"
+
     destination_path="$(dirname "$destination")"
+
     if [[ ! -s "$destination" ]] ; then
+
       mkdir -p "$destination_path"
+
       cp "gemsets/$gemset_file" "$destination"
+
     fi
-  done ; unset destination destination_path gemset_file
+
+  done
+
+  unset destination destination_path gemset_file
+
 fi
 
 if [[ -d patchsets/ ]] ; then
-  mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
-    destination="$rvm_patchsets_path/$patchset_file"
-    destination_path="$(dirname "$destination")"
+
+  if [[ ! -d "$rvm_path/patchsets" ]] ; then
+
+    mkdir -p "$rvm_path/patchsets"
+
+  fi
+
+  patchsets=($(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///'))
+
+  for patchset_file in "${patchsets[@]}" ; do
+
+    destination="$rvm_path/patchsets/$patchset_file"
+
     if [[ ! -s "$destination" ]] ; then
+
+      destination_path="$(dirname "$destination")"
+
       mkdir -p "$destination_path"
+
       cp "patchsets/$patchset_file" "$destination"
+
     fi
-  done ; unset destination destination_path patchset_file
+  done
+
 fi
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+
 mkdir -p "$rvm_rubies_path/"
+
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
+
   if [[ -d "$ruby" ]] ; then
+
     mv "$ruby" "$rvm_rubies_path/"
+
     new_path="$rvm_rubies_path/$(basename $ruby)"
+
     for file in gem rake ; do
+
       if [[ -s "$new_path/bin/$file" ]] ; then
+
         sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+
         mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
+
         chmod +x "$new_path/bin/$file"
+
       fi
+
     done
+
   fi
+
 done
 #
 # End of rubies migration.
@@ -340,36 +426,60 @@ done
 # Migrate old gemset directories to new gemset pattern.
 #
 for gemset in "$rvm_path"/gems/*\%* ; do
-  new_path=${gemset/\%/${rvm_gemset_separator}}
+
+  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"
+
   fi
+
 done
 
 for gemset in "$rvm_path"/gems/*\+* ; do
-  new_path=${gemset/\+/${rvm_gemset_separator}}
+
+  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
+
   fi
+
 done
 
 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"
+
   fi
+
 done
 
 # Move from legacy defaults to the new, alias based system.
 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}#")")"
+
+  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
+
+    "$rvm_path/scripts/alias" create default "$original_version" &> /dev/null
+
   fi ; unset original_version
+
   rm -rf "$rvm_config_path/default"
+
 fi
 
 #
@@ -380,13 +490,21 @@ printf "\n    Correct permissions for base binaries in $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
+
+done
+
 printf "\n    Copying manpages into place."
 
-for man_file in $(builtin cd "$install_source_path/man" ; find * -type f -maxdepth 0 -print); do
+files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
+
+for file in "${files[@]//.\/}" ; do
+
   rm -rf "$rvm_man_path/$man_file"
+
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+
 done
 
 [[ "$upgrade_flag" = 0 ]] && ./scripts/notes
@@ -400,13 +518,19 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   check_rubyopt_conditions
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
+
 else
+
   if [[ ${rvm_selfcontained:-0} -eq 1 ]] ; then
+
     installation_complete
+
   fi
 
   if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+
     andand_return_warning
+
   fi
 
   check_rubyopt_conditions