kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Properly look for man pages

Browse source 
When bundler is installed as a default gem (either by ruby's or by
rubygems' installer), bundler man pages wouldn't be properly found.

https://github.com/rubygems/rubygems/commit/0831b40492
This commit is contained in:
David Rodríguez 2020-04-27 14:31:26 +02:00 committed by Hiroshi SHIBATA
parent a453f26b0d
commit 241950b1c5
Notes: git 2020-05-08 14:14:16 +09:00 
Merged: https://github.com/ruby/ruby/pull/3092
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/bundler/cli.rb
View file

@ -123,9 +123,9 @@ module Bundler
end end
man_path = File.expand_path("../../../man", __FILE__) man_path = File.expand_path("../../../man", __FILE__)
# man files are located under the share directory with the default gems of bundler # man files are located under ruby's mandir with the default gems of bundler
man_path = File.expand_path("../../../../../share/man/man1", __FILE__) unless File.directory?(man_path) man_path = RbConfig::CONFIG["mandir"] unless File.directory?(man_path)
man_pages = Hash[Dir.glob(File.join(man_path, "*")).grep(/.*\.\d*\Z/).collect do |f| man_pages = Hash[Dir.glob(File.join(man_path, "**", "*")).grep(/.*\.\d*\Z/).collect do |f|
[File.basename(f, ".*"), f] [File.basename(f, ".*"), f]
end] end]
@ -134,7 +134,7 @@ module Bundler
if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+} if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
Kernel.exec "man #{man_page}" Kernel.exec "man #{man_page}"
else else
puts File.read("#{man_path}/#{File.basename(man_page)}.txt") puts File.read("#{File.dirname(man_page)}/#{File.basename(man_page)}.txt")
end end
elsif command_path = Bundler.which("bundler-#{cli}") elsif command_path = Bundler.which("bundler-#{cli}")
Kernel.exec(command_path, "--help") Kernel.exec(command_path, "--help")