From 5180de635a93d079070f1c942522cf2a969ec7f8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 5 Apr 2015 00:34:27 +0000
Subject: rbinstall.rb: same options for gems

* tool/rbinstall.rb (gem): share same options between normal
  installer and unpacked installer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/rbinstall.rb | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'tool')

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)
-- 
cgit v1.2.3