[前][次][番号順一覧][スレッド一覧]

ruby-changes:60846

From: Hiroshi <ko1@a...>
Date: Tue, 21 Apr 2020 06:53:55 +0900 (JST)
Subject: [ruby-changes:60846] b9962f0e89 (master): Fixed incorrect man path with ruby installation path

https://git.ruby-lang.org/ruby.git/commit/?id=b9962f0e89

From b9962f0e8909b1163320fbcfe80060a259b2353d Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Mon, 20 Apr 2020 21:20:54 +0900
Subject: Fixed incorrect man path with ruby installation path

  [Bug #15359][ruby-core:90164]

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 443458f..22fca7f 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -123,6 +123,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli.rb#L123
       end
 
       man_path  = File.expand_path("../../../man", __FILE__)
+      # man files are located under the share directory with the default gems of bundler
+      man_path = File.expand_path("../../../../../share/man/man1", __FILE__) unless File.directory?(man_path)
       man_pages = Hash[Dir.glob(File.join(man_path, "*")).grep(/.*\.\d*\Z/).collect do |f|
         [File.basename(f, ".*"), f]
       end]
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]