Skip to content

Commit

Permalink
Remove MacOS specific gem layout
Browse files Browse the repository at this point in the history
MacOS should properly configure Ruby. They should not expect us to
maintain a different layout just for them.
  • Loading branch information
deivid-rodriguez committed Aug 9, 2021
1 parent e50125c commit ecad900
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions lib/rubygems/defaults.rb
Expand Up @@ -34,21 +34,7 @@ def self.default_spec_cache_dir
# 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

##
Expand Down Expand Up @@ -197,11 +183,7 @@ def self.default_exec_format
# 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
Expand Down

0 comments on commit ecad900

Please sign in to comment.