diff options
Diffstat (limited to 'lib/rubygems/require_paths_builder.rb')
-rw-r--r-- | lib/rubygems/require_paths_builder.rb | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/rubygems/require_paths_builder.rb b/lib/rubygems/require_paths_builder.rb index 5cf41b9da8..61bc1af920 100644 --- a/lib/rubygems/require_paths_builder.rb +++ b/lib/rubygems/require_paths_builder.rb @@ -1,13 +1,24 @@ +###################################################################### +# This file is imported from the rubygems project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis or Eric Hodel. +###################################################################### + require 'rubygems' +# TODO: remove after 1.9.1 dropped module Gem::RequirePathsBuilder def write_require_paths_file_if_needed(spec = @spec, gem_home = @gem_home) - require_paths = spec.require_paths - return if require_paths.size == 1 and require_paths.first == "lib" - file_name = "#{gem_home}/gems/#{@spec.full_name}/.require_paths".untaint - File.open(file_name, "wb") do |file| - file.puts require_paths + return if spec.require_paths == ["lib"] && + (spec.bindir.nil? || spec.bindir == "bin") + file_name = File.join(gem_home, 'gems', "#{@spec.full_name}", ".require_paths") + file_name.untaint + File.open(file_name, "w") do |file| + spec.require_paths.each do |path| + file.puts path + end + file.puts spec.bindir if spec.bindir end end -end +end if QUICKLOADER_SUCKAGE |