rvm 0.1.43 → 0.1.44

data/scripts/install

@@ -1,10 +1,18 @@
 #!/usr/bin/env bash
 
+if [[ -z "$rvm_sandboxed" ]]; then
+  if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+    export rvm_sandboxed=0
+  else
+    export rvm_sandboxed=1
+  fi
+fi
+
 unset rvm_auto_flag
 
-install_source_path=$(dirname $0)
+install_source_path="$(dirname "$0" | sed 's#\/scripts$##')"
 if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
-  builtin cd $install_source_path
+  builtin cd "$install_source_path"
 fi
 
 source scripts/version
@@ -53,7 +61,7 @@ done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
-  if [[ "root" = "$(whoami)" ]] ; then
+  if [[ "$rvm_sandboxed" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
@@ -64,7 +72,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; 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
@@ -114,7 +122,7 @@ fi
 
 spinner
 
-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
+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 file in README LICENCE ; do
   spinner
@@ -148,7 +156,7 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo rvm-shell ; do
+for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
@@ -183,29 +191,30 @@ fi
 # Initial Interpreter Gemsets.
 #
 spinner
-mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
-  source_path="$(pwd)/gemsets"
-  destination="$rvm_gemsets_path/$gemset_file"
-  destination_path="$(dirname "$destination")"
-  if [[ ! -s "$destination" ]] ; then
-    mkdir -p "$destination_path"
-    cp "$source_path/$gemset_file" "$destination"
-  fi
-done ; unset destination destination_path source_path gemset_file
+if [[ -d gemsets/ ]] ; then
+  mkdir -p "$rvm_gemsets_path"
+  for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
+    destination="$rvm_gemsets_path/$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
+fi
 
 spinner
-mkdir -p "$rvm_patchsets_path"
-for patchsets_file in $(cd gemsets ; find . -iname '*' | sed 's/^\.\///') ; do
-  source_path="$(pwd)/gemsets"
-  destination="$rvm_patchsets_path/$patchset_file"
-  destination_path="$(dirname "$destination")"
-  if [[ ! -s "$destination" ]] ; then
-    mkdir -p "$destination_path"
-    cp "$source_path/$patchset_file" "$destination"
-  fi
-done ; unset destination destination_path source_path patchset_file
-
+if [[ -d patchsets/ ]] ; then
+  mkdir -p "$rvm_patchsets_path"
+  for patchset_file in $(cd patchsets ; find . -iname '*' | sed 's/^\.\///') ; do
+    destination="$rvm_patchsets_path/$patchset_file"
+    destination_path="$(dirname "$destination")"
+    if [[ ! -s "$destination" ]] ; then
+      mkdir -p "$destination_path"
+      cp "patchsets/$patchset_file" "$destination"
+    fi
+  done ; unset destination destination_path patchset_file
+fi
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
@@ -276,7 +285,7 @@ fi
 
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 mkdir -p $rvm_bin_path
-for file in rvm rvmsudo rvm-shell ; do
+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
 printf "\n    Copying manpages into place."
@@ -285,9 +294,7 @@ for man_file in $(\ls "$install_source_path/man"); do
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done
 
-if [[ "$upgrade_flag" -eq 0 ]] ; then
-  ./scripts/notes
-fi
+[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 printf "\n\n${name:-"$(whoami)"},\n"

data/scripts/irbrc.rb

@@ -2,6 +2,11 @@
 # This file will be overriden every time you update rvm.
 
 # Turn on completion.
+begin
+require "readline"
+rescue
+  puts "Readline was unable to be required, if you need completion or history install readline then reinstall the ruby.\nYou may follow 'rvm notes' for dependencies and/or read the docs page http://rvm.beginrescueend.com/packages/readline/ . Be sure you 'rvm remove X ; rvm install X' to re-compile your ruby with readline support after obtaining the readline libraries."
+end
 require "irb/completion" rescue nil
 
 # Turn on history saving.

data/scripts/list

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
-
-source "$rvm_scripts_path/utility"
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
 
 list_gemsets() {
   if [[ "$1" = "strings" ]]; then
@@ -23,7 +22,7 @@ list_gemsets() {
     elif [[ -n "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
-      string="[ $(file $rvm_rubies_path/$ruby_version_name/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file $rvm_rubies_path/$ruby_version_name/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
     fi
     unset ruby_version_name
     printf "\n"
@@ -39,7 +38,7 @@ list_gemsets() {
     version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
-      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
       printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
     fi ; unset version
   fi
@@ -57,7 +56,7 @@ list_default() {
       version=$($rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
         printf "\n\nDefault Ruby (for new shells)\n"
-        string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+        string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
         printf "\n   $(tput setaf 2)$version$(tput sgr0) $string\n"
       fi ; unset version
     fi
@@ -115,7 +114,7 @@ list_rubies() {
     elif [[ ! -z "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
-      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
     fi
     printf "\n"
     if [[ "$version" = "$current_ruby" ]]; then
@@ -130,7 +129,7 @@ list_rubies() {
     version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
-      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
       printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
     fi ; unset version
   fi

data/scripts/maglev

@@ -156,7 +156,7 @@ if [[ ! -f /etc/sysctl.conf ]] || [[ "$(grep -sc "kern.*.shm" /etc/sysctl.conf)"
       # before they will take effect.
       echo "# kern.sysv.shm* settings added by MagLev installation" > /tmp/sysctl.conf.$$
       sysctl kern.sysv.shmmax kern.sysv.shmall kern.sysv.shmmin kern.sysv.shmmni \
-      kern.sysv.shmseg  | tr ":" "=" | tr -d " " >> /tmp/sysctl.conf.$$
+      kern.sysv.shmseg  | \tr ":" "=" | \tr -d " " >> /tmp/sysctl.conf.$$
     ;;
     Solaris-x86)
       # Do nothing in Solaris-x86 since /etc/sysctl.conf is ignored on Solaris 10.

data/scripts/manage

@@ -28,7 +28,7 @@ __rvm_check_for_bison() {
 __rvm_current_patch_names() {
   # TODO: Lookup default patches on rvm_ruby_string heirarchy.
   local patches="$rvm_patch_names default"
-  for patch_name in $(echo "$patches" | tr ',' ' ' | __rvm_strip); do
+  for patch_name in $(echo "$patches" | \tr ',' ' ' | __rvm_strip); do
     __rvm_expand_patch_name "$patch_name"
   done
 }
@@ -150,8 +150,8 @@ __rvm_install_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ -n "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
-  
-  # Check for clang if the flag is set  
+
+  # Check for clang if the flag is set
   __rvm_check_for_clang
   local result="$?"
   [[ "$result" -gt 0 ]] && return $result
@@ -271,7 +271,7 @@ RubyWrapper
           $rvm_scripts_path/log "error" "There has been an error while trying to apply patches to ree. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
 
-        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options $db_configure_flags $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_string $rvm_ree_options $db_configure_flags $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while depending on your cpu(s)..."
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
@@ -305,7 +305,7 @@ RubyWrapper
       unset CFLAGS LDFLAGS ARCHFLAGS # Important.
 
       unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-      PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+      PATH=$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       if [[ -n "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
@@ -376,7 +376,7 @@ RubyWrapper
       file_name="$rvm_ruby_home/bin/irb"
       rm -f "$file_name"
       printf '#!/usr/bin/env bash\n' > "$file_name"
-      printf "exec '$rvm_ruby_home/bin/rbx' 'irb' \"\$@\"\n" >> "$file_name" 
+      printf "exec '$rvm_ruby_home/bin/rbx' 'irb' \"\$@\"\n" >> "$file_name"
       [[ -f "$file_name" ]] && chmod +x "$file_name"
 
       # Install Gem Wrapper on Rubinius.
@@ -470,7 +470,7 @@ RubyWrapper
 
       if [[ -n "$rvm_head_flag" ]] ; then
         builtin cd $rvm_ruby_src_path
-        rvm_gemstone_package_file="GemStone-$(grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | tr ' ' '-')"
+        rvm_gemstone_package_file="GemStone-$(grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | \tr ' ' '-')"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
       fi
 
@@ -516,11 +516,11 @@ RubyWrapper
       if [[ -n "$rvm_head_flag" ]] ; then
         git submodule update --init
         $rvm_ruby_home/bin/maglev force-reload
-        ln -sf maglev.demo.key-$(uname -sm | tr ' ' '-') etc/maglev.demo.key
+        ln -sf maglev.demo.key-$(uname -sm | \tr ' ' '-') etc/maglev.demo.key
       fi
 
       #ln -fs "$rvm_ruby_home/$(echo $rvm_gemstone_package_file | awk -F'.' '{print $1}')" "$rvm_ruby_home/gemstone"
-      
+
       compatible_ruby="$(__rvm_18_compat_ruby)"
 
       if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
@@ -608,14 +608,14 @@ RubyWrapper
       binaries=(gem irb rdoc rake ri ruby)
       for binary_name in ${binaries[@]} ; do
         if [[ -s $rvm_ruby_home/bin/$binary_name ]] ; then
-          cat "$rvm_ruby_home/bin/$binary_name" | tr -d '\r' > "$rvm_ruby_home/bin/$binary_name.new"
+          cat "$rvm_ruby_home/bin/$binary_name" | \tr -d '\r' > "$rvm_ruby_home/bin/$binary_name.new"
           #sed -e '1,1s=.*=#!'"/usr/bin/env ir=" "$rvm_ruby_home/bin/$binary_name" > "$rvm_ruby_home/bin/$binary_name.new"
           mv -f "$rvm_ruby_home/bin/$binary_name.new" "$rvm_ruby_home/bin/$binary_name"
           chmod +x $rvm_ruby_home/bin/$binary_name
         fi
       done
 
-      sed -e '1,1s=.*=#!'"/usr/bin/env bash=" "$rvm_ruby_home/bin/ir" | tr -d '\r' > "$rvm_ruby_home/bin/ir.new"
+      sed -e '1,1s=.*=#!'"/usr/bin/env bash=" "$rvm_ruby_home/bin/ir" | \tr -d '\r' > "$rvm_ruby_home/bin/ir.new"
       mv -f "$rvm_ruby_home/bin/ir.new" "$rvm_ruby_home/bin/ir"
       chmod +x $rvm_ruby_home/bin/ir
       ln -fs $rvm_ruby_home/bin/ir $rvm_ruby_home/bin/ruby
@@ -626,7 +626,7 @@ RubyWrapper
     mput|shyouhei)
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
       unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-      PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+      PATH=$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
@@ -690,7 +690,7 @@ RubyWrapper
     ;;
 
     ruby)
-      __rvm_check_for_bison
+      __rvm_check_for_bison # Run like hell
       result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
 
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
@@ -732,42 +732,55 @@ __rvm_fetch_ruby() {
     rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_string"}"
     rvm_ruby_package_file="${rvm_ruby_package_file:-"$rvm_ruby_package_name"}"
     rvm_archive_extension="${rvm_archive_extension:-tar.gz}"
+
     if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
       if [[ "ruby" = "$rvm_ruby_interpreter" ]] ; then
         rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_release_version}.${rvm_major_version}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
       elif [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/${rvm_ruby_package_file}.${rvm_archive_extension}"
       elif [[ "jruby" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_version/$rvm_ruby_package_file.$rvm_archive_extension"
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/${rvm_ruby_version}/${rvm_ruby_package_file}.${rvm_archive_extension}"
       elif [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
         : # Should already be set from selector
       else
-        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/${rvm_ruby_package_file}.${rvm_archive_extension}"
       fi
-      $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
-      $rvm_scripts_path/fetch "$rvm_url"
+      "$rvm_scripts_path/log" "info" "Downloading ${rvm_ruby_package_file}, this may take a while depending on your connection..."
+      "$rvm_scripts_path/fetch" "${rvm_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
     fi
 
-    # Only re-extract if forced.
-    if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ -n "$rvm_force_flag" ]] ; then
+    if [[ ! -d "$rvm_ruby_src_path" ]] || [[ -n "$rvm_force_flag" ]] ; then
+      rm -rf "$rvm_ruby_src_path" # Especially when forced, we want to ensure the destination is missing.
+
+      mkdir -p "/tmp/rvm_src_$$"
+
       if [[ "tar.gz" = "$rvm_archive_extension" ]] || [[ "tgz" = "$rvm_archive_extension" ]] ; then
-        __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+        __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | gunzip | tar xf - -C /tmp/rvm_src_$$" "Extracting $rvm_ruby_package_file ..."
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
       elif [[ "zip" = "$rvm_archive_extension" ]] ; then
-        __rvm_run "extract" "unzip -q -o $rvm_archives_path/$rvm_ruby_package_file -d $rvm_src_path"
+        __rvm_run "extract" "unzip -q -o $rvm_archives_path/$rvm_ruby_package_file -d /tmp/rvm_src_$$"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
       fi
+
+      mv "/tmp/rvm_src_$$/$(\cd /tmp/rvm_src_$$ ; \ls)" "$rvm_ruby_src_path" ; rm -rf "/tmp/rvm_src_$$"
+
+      if [[ -n "$rvm_ruby_name" ]] && [[ -d "$rvm_src_path/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
+        mv "$rvm_src_path/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" "$rvm_ruby_src_path"
+      fi
+
     else
       $rvm_scripts_path/log "info" "$rvm_ruby_src_path has already been extracted." ; __rvm_pushpop ; return 0
     fi
+
   else
+
     mkdir -p "$rvm_repo_path"
     if [[ -n "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_repo_path/.git" ]] ; then
@@ -1155,7 +1168,7 @@ __rvm_manage_rubies() {
   local manage_result=0
 
   if [[ -n "$rubies_string" ]] ;then
-    for rvm_ruby_string in $(echo "$rubies_string" | tr ',' ' ') ; do
+    for rvm_ruby_string in $(echo "$rubies_string" | \tr ',' ' ') ; do
       current_manage_ruby_string="$rvm_ruby_string"
       eval "__rvm_${rvm_action}_ruby"
       result="$?"

data/scripts/manpages

@@ -5,4 +5,4 @@ source "$rvm_scripts_path/initialize"
 # Take if a semicolon is encountered at the end of the
 # manpath env variable, man also processes the usual,
 # generated manpaths as well as the variable contents.
-export MANPATH="${rvm_man_path}:${MANPATH}"
+export MANPATH="${MANPATH}:${rvm_man_path}"

data/scripts/notes

@@ -14,9 +14,11 @@ if [[ "Linux" = "$system" ]] ; then
   rvm_pacman_binary="$(command -v pacman)"
   rvm_yum_binary="$(command -v yum)"
 
+  printf "\n    $item NOTE: MRI stands for Matz's Ruby Interpreter (1.8.X, 1.9.X), ree stands for Ruby Enterprise Edition and rbx stands for Rubinius.\n\n"
   printf "\n    $item curl is required.\n"
   printf "\n    $item patch is required (for ree, some ruby head's).\n"
   printf "\n    $item If you wish to install rbx and/or any MRI head (eg. 1.9.2-head) then you must install and use rvm 1.8.7 first.\n"
+
   if [[ ! -z "$rvm_aptitude_binary" ]] ; then
     printf "\n    $item For JRuby (if you wish to use it) you will need:"
     printf "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"

data/scripts/repair

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+source "$rvm_scripts_path/base"
+
+usage() {
+  echo "Usage: rvm repair {symlinks,environments,archives,all}" >&2
+  return 1
+}
+
+# Removes stale symlinks in $rvm_bin_path, likely
+# related to wrappers.
+repair_symlinks() {
+  __rvm_pushpop "$rvm_bin_path"
+  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")"
+      rm -f "$executable_name"
+    fi
+  done; unset executable_name
+  __rvm_pushpop
+}
+
+# Regenerates each symlink file.
+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'"
+    [[ -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_enviroment_files)
+  done; unset environment_name
+}
+
+# Removes archives that have incorrect md5 sums.
+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."
+      rm -rf "$rvm_archives_path/$archive_file"
+    fi
+  done; unset archive_file
+}
+
+repair_all() {
+  repair_symlinks
+  repair_archives
+  repair_environments
+  $rvm_scripts_path/log "info" "All items repaired."
+}
+
+if [[ -z "$1" ]]; then
+  usage
+  exit $?
+fi
+
+case "$1" in
+  all)          repair_all ;;
+  symlinks)     repair_symlinks ;;
+  environments) repair_environments ;;
+  archives)     repair_archives;;
+  *)            usage ;;
+esac
+
+exit $?