diff options
Diffstat (limited to 'tool/rbinstall.rb')
| -rwxr-xr-x | tool/rbinstall.rb | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 50bb6434d5..0ea6e8c95c 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -736,13 +736,19 @@ install?(:ext, :comm, :gem) do prepare "bundle gems", gem_dir, directories install_dir = with_destdir(gem_dir) installed_gems = {} + options = { + :install_dir => install_dir, + :bin_dir => with_destdir(bindir), + :domain => :local, + :ignore_dependencies => true, + :dir_mode => $dir_mode, + :data_mode => $data_mode, + :prog_mode => $prog_mode, + :wrappers => true, + :format_executable => true, + } Gem::Specification.each_spec([srcdir+'/gems/*']) do |spec| - ins = RbInstall::UnpackedInstaller.new(spec, - :install_dir => install_dir, - :bin_dir => with_destdir(bindir), - :wrappers => true, - :ignore_dependencies => true, - :format_executable => true) + ins = RbInstall::UnpackedInstaller.new(spec, options) puts "#{" "*30}#{spec.name} #{spec.version}" ins.install installed_gems[spec.full_name] = true @@ -753,17 +759,6 @@ install?(:ext, :comm, :gem) do end next if gems.empty? if defined?(Zlib) - options = { - :install_dir => install_dir, - :bin_dir => with_destdir(bindir), - :domain => :local, - :ignore_dependencies => true, - :dir_mode => $dir_mode, - :data_mode => $data_mode, - :prog_mode => $prog_mode, - :wrappers => true, - :format_executable => true, - } gems.each do |gem| Gem.install(gem, Gem::Requirement.default, options) gemname = File.basename(gem) |