diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-28 14:49:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-28 14:49:39 +0000 |
| commit | 34fbf57aaafee9390a0f7427eb90efac099e33ec (patch) | |
| tree | 7e6c153a06761221501b0b64955df535c02f7988 | |
| parent | 42c2cc7c57822da9f010a3695aa64a16efc1efea (diff) | |
| download | ruby-34fbf57aaafee9390a0f7427eb90efac099e33ec.tar.gz | |
rbinstall.rb: fix bundled gems location
* rbinstall.rb: fix target location for installing bundled gems.
install to the prepared directory instead of default Gem.dir,
not to be affected GEM_HOME environment variable. [Fix GH-798]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Dec 28 23:49:37 2014 Michal Papis <mpapis@gmail.com> + + * rbinstall.rb: fix target location for installing bundled gems. + install to the prepared directory instead of default Gem.dir, + not to be affected GEM_HOME environment variable. [Fix GH-798] + Sun Dec 28 18:19:28 2014 Eric Wong <e@80x24.org> * test/-ext-/iseq_load/test_iseq_load.rb diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index db36a2159c..0d15a591a7 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -719,7 +719,7 @@ install?(:ext, :comm, :gem) do directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) prepare "bundle gems", gem_dir, directories Dir.glob(srcdir+'/gems/*.gem').each do |gem| - Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(Gem.dir), :domain => :local, :ignore_dependencies => true + Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(gem_dir), :domain => :local, :ignore_dependencies => true gemname = Pathname(gem).basename puts "#{" "*30}#{gemname}" end |