repair in rvm-1.0.8

- old
+ new

@@ -9,36 +9,42 @@
 
 # Removes stale symlinks in $rvm_bin_path, likely
 # related to wrappers.
 repair_symlinks() {
   (
-    builtin cd "$rvm_bin_path"
+    builtin cd "${rvm_bin_path:-"$rvm_path/bin"}"
+
     for executable_name in $(\find \. -type l); do
-      [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_wrappers_path/"* ]] && continue
+
+      [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_path/wrappers/"* ]] && continue
+
       if [[ -f "$executable_name" ]]  ; then
+
         "$rvm_path/scripts/log" "info" \
           "Removing stale symlink from $(basename "$executable_name")"
+
         \rm -f "$executable_name"
+
       fi
     done
   )
 }
 
 # Regenerates each symlink file.
 repair_environments() {
   local environment_name environments
 
-  environments=($(cd "$rvm_environments_path" ; find . -maxdepth 1 -mindepth 1 -type f))
+  environments=($(cd "$rvm_path/environments" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for environment_name in "${environments[@]//.\/}" ; do
 
-    [[ -L "$rvm_environments_path/$environment_name" ]] && continue
+    [[ -L "$rvm_path/environments/$environment_name" ]] && continue
 
     "$rvm_path/scripts/log" "info" \
       "Regenerating environment file for '$environment_name'"
 
-    [[ -f "$rvm_environments_path/$environment_name" ]] && \rm -f "$rvm_environments_path/$environment_name"
+    [[ -f "$rvm_path/environments/$environment_name" ]] && \rm -f "$rvm_path/environments/$environment_name"
 
     (
     source "$rvm_path/scripts/base"
 
     __rvm_become "$environment_name"
@@ -52,24 +58,24 @@
 # Removes archives that have incorrect md5 sums.
 repair_archives() {
 
   local archive_file archives stored_md5sum
 
-  archives=($(cd "$rvm_archives_path" ; find . -maxdepth 1 -mindepth 1 -type f))
+  archives=($(cd "${rvm_archives_path:-"$rvm_path/archives"}" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for archive_file in "${archives[@]//.\/}" ; do
 
-    [[ -f "$rvm_archives_path/$archive_file" ]] || continue
+    [[ -f "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" ]] || continue
 
-    stored_md5sum="$($rvm_path/scripts/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
+    stored_md5sum="$($rvm_path/scripts/db "$rvm_path/config/md5" "$archive_file" | head -n1)"
 
     if [[ -n "$stored_md5sum" ]] ; then
 
-      if [[ ! "$rvm_path/scripts/md5" "$rvm_archives_path/$archive_file" "$stored_md5sum" ]] ; then
+      if [[ ! "$rvm_path/scripts/md5" "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" "$stored_md5sum" ]] ; then
 
         "$rvm_path/scripts/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
 
-        rm -rf "$rvm_archives_path/$archive_file"
+        rm -rf "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file"
       fi
     fi
   done
 
   return 0