Permalink
Browse files

Remove .ext/rdoc if it exists, for those having trouble with it when …

…installing 1.9.2-head.
  • Loading branch information...
1 parent d8afd32 commit 4e7fa120c89f6e43d81e0cad9e3d7f11ea796613 @wayneeseguin wayneeseguin committed Apr 11, 2010
Showing with 14 additions and 12 deletions.
  1. +14 −12 scripts/manage
View
@@ -39,18 +39,18 @@ __rvm_install_source() {
fi
fi
- if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
- # How to install ruby 1.8.5... "sneaky sneaky, sir"
- src_dir="ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
- if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
- cp ~/.rvm/src/$src_dir/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
- cp ~/.rvm/src/$src_dir/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
- cp ~/.rvm/src/$src_dir/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
- src_dir="ruby-1.8.6-p$(__rvm_db "ruby_1.8.6_patch_level")"
- if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
- cp ~/.rvm/src/$src_dir/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
- unset src_dir
- fi
+ #if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
+ # # How to install ruby 1.8.5... "sneaky sneaky, sir"
+ # src_dir="ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
+ # if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
+ # cp ~/.rvm/src/$src_dir/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+ # cp ~/.rvm/src/$src_dir/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+ # cp ~/.rvm/src/$src_dir/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+ # src_dir="ruby-1.8.6-p$(__rvm_db "ruby_1.8.6_patch_level")"
+ # if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
+ # cp ~/.rvm/src/$src_dir/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
+ # unset src_dir
+ #fi
#
#if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
@@ -85,6 +85,8 @@ __rvm_install_source() {
$rvm_scripts_path/log "error" "There has been an error while running make. Aborting the installation." ; __rvm_pushpop ; return $result
fi
+ if [[ -d .ext/rdoc ]] ; then rm -rf .ext/rdoc ; fi
+
rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
__rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
result=$? ; if [[ "$result" -gt 0 ]] ; then

0 comments on commit 4e7fa12

Please sign in to comment.