Permalink
Browse files

Install rdoc before rake.

  • Loading branch information...
1 parent b6d9c89 commit cfde2b16091758c61e63baf1dc5d7f992307ab49 @wayneeseguin wayneeseguin committed Apr 2, 2010
Showing with 8 additions and 6 deletions.
  1. +8 −6 scripts/manage
View
14 scripts/manage
@@ -152,8 +152,8 @@ __rvm_install_ruby() {
mkdir -p "$rvm_ruby_home/bin"
fi
- binaries="erb gem irb rake rdoc ri ruby testrb" # Trick to work in more shells :)
- for binary_name in $(echo $binaries); do
+ binaries=(erb gem irb rake rdoc ri ruby testrb)
+ for binary_name in ${binaries[@]}; do
# if [[ $binary_name != "gem" ]] ; then prefix="-S" ; fi
ruby_wrapper=$(cat <<RubyWrapper
#!/usr/bin/env bash
@@ -226,7 +226,7 @@ RubyWrapper
__rvm_rubygems_setup
- for rvm_gem_name in rake ; do
+ for rvm_gem_name in rdoc rake ; do
__rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
done
__rvm_inject_ruby_shebang "$rvm_ruby_gem_home/bin/rake"
@@ -486,7 +486,6 @@ RubyWrapper
$rvm_scripts_path/log "info" "Generating smalltalk FFI."
$rvm_bin_path/rvm 1.8.7 rake stwrappers >/dev/null 2>&1
-
# TODO: Figure out if anything needs to be done with rubygems.
#__rvm_rubygems_setup
__rvm_irbrc
@@ -554,7 +553,7 @@ RubyWrapper
cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
- binaries="gem irb rake rdoc ri ruby"
+ binaries="gem irb rdoc rake ri ruby"
for binary_name in $(echo $binaries); do
binary_path=""
if [[ "ruby" != "$binary_name" ]] ; then
@@ -849,7 +848,7 @@ __rvm_post_install() {
$rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string."
- for rvm_gem_name in rake ; do
+ for rvm_gem_name in rdoc rake ; do
home="$GEM_HOME" ; path="$GEM_PATH" # Save
export GEM_HOME="$rvm_ruby_global_gems_path"
export GEM_PATH="$rvm_ruby_global_gems_path"
@@ -949,6 +948,9 @@ __rvm_rubygems_setup() {
ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
unset ruby_lib_gem_path
+ if [[ -s "$rvm_ruby_src_path/bin/rdoc" ]] ; then
+ __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rdoc"
+ fi
if [[ -s "$rvm_ruby_src_path/bin/rake" ]] ; then
__rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rake"
fi

0 comments on commit cfde2b1

Please sign in to comment.