scripts/rvm-ruby-installer in rvm-0.0.42 vs scripts/rvm-ruby-installer in rvm-0.0.43

- old
+ new

@@ -202,11 +202,11 @@ for rvm_gem_name in rake ; do __rvm_log "info" "Installing $rvm_gem_name" __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q done - __rvm_bin_script + __rvm_bin_scripts popd > /dev/null ;; rbx|rubinius) @@ -233,11 +233,30 @@ __rvm_run "build" rake build fi for binary in ruby irb ; do ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary done - __rvm_bin_script + $rvm_ruby_home/bin/rbx -S gem install rake --no-rdoc --no-ri + + ruby_wrapper=$(cat <<RubyWrapper +#!/bin/bash + +GEM_HOME="$rvm_gem_home" ; export GEM_HOME +GEM_PATH="$rvm_gem_home" ; export GEM_PATH +MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME +PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH + +exec $rvm_ruby_home/bin/rbx -S gem "\$@" +RubyWrapper +) + echo "$ruby_wrapper" > $rvm_bin_path/gem-$rvm_ruby_package_name + echo "$ruby_wrapper" > $rvm_ruby_home/bin/gem + unset ruby_wrapper + chmod +x $rvm_bin_path/$rvm_ruby_package_name + chmod +x $rvm_ruby_home/bin/gem + + __rvm_bin_scripts ;; jruby) rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version" rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.zip" @@ -277,10 +296,10 @@ chmod +x $rvm_ruby_home/bin/* for binary in jruby jgem jirb ; do ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j} done - __rvm_bin_script + __rvm_bin_scripts ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name for rvm_gem_name in rake jruby-openssl ; do __rvm_log "info" "Installing $rvm_gem_name" __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q