From 6c1da63bd77b4caa409b919f8c9893b27f9ae1be Mon Sep 17 00:00:00 2001 From: drbrain Date: Wed, 18 Apr 2012 00:04:12 +0000 Subject: * lib/rubygems: Update to RubyGems 1.8.22 plus r33517 and r35337 which were ported to the rubygems git repository. See https://github.com/rubygems/rubygems/blob/1.8/History.txt for changes since 1.8.11. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/commands/setup_command.rb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'lib/rubygems/commands/setup_command.rb') diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 52a3b88fe3..0c957393d9 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -252,9 +252,19 @@ TEXT end def make_destination_dirs(install_destdir) - lib_dir = nil - bin_dir = nil + lib_dir, bin_dir = Gem.default_rubygems_dirs + unless lib_dir + lib_dir, bin_dir = generate_default_dirs(install_destdir) + end + + mkdir_p lib_dir + mkdir_p bin_dir + + return lib_dir, bin_dir + end + + def generate_default_dirs(install_destdir) prefix = options[:prefix] site_or_vendor = options[:site_or_vendor] @@ -283,10 +293,7 @@ TEXT bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '') end - mkdir_p lib_dir - mkdir_p bin_dir - - return lib_dir, bin_dir + [lib_dir, bin_dir] end def remove_old_bin_files(bin_dir) -- cgit v1.2.3