ruby-changes:67461
From: David <ko1@a...>
Date: Tue, 31 Aug 2021 19:07:39 +0900 (JST)
Subject: [ruby-changes:67461] afabef5a5a (master): [rubygems/rubygems] Remove MacOS specific gem layout
https://git.ruby-lang.org/ruby.git/commit/?id=afabef5a5a From afabef5a5ab067ee34e70be54fc1b3cfcad63862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Sun, 8 Aug 2021 10:21:32 +0200 Subject: [rubygems/rubygems] Remove MacOS specific gem layout MacOS should properly configure Ruby. They should not expect us to maintain a different layout just for them. https://github.com/rubygems/rubygems/commit/ecad900925 --- lib/rubygems/defaults.rb | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index e95bc06..f29104a 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -34,21 +34,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/lib/rubygems/defaults.rb#L34 # specified in the environment def self.default_dir - path = if defined? RUBY_FRAMEWORK_VERSION - [ - File.dirname(RbConfig::CONFIG['sitedir']), - 'Gems', - RbConfig::CONFIG['ruby_version'], - ] - else - [ - RbConfig::CONFIG['rubylibprefix'], - 'gems', - RbConfig::CONFIG['ruby_version'], - ] - end - - @default_dir ||= File.join(*path) + @default_dir ||= File.join(RbConfig::CONFIG['rubylibprefix'], 'gems', RbConfig::CONFIG['ruby_version']) end ## @@ -197,11 +183,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/lib/rubygems/defaults.rb#L183 # The default directory for binaries def self.default_bindir - if defined? RUBY_FRAMEWORK_VERSION # mac framework support - '/usr/local/bin' - else # generic install - RbConfig::CONFIG['bindir'] - end + RbConfig::CONFIG['bindir'] end def self.ruby_engine -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/