ruby-changes:60880
From: Nobuyoshi <ko1@a...>
Date: Thu, 23 Apr 2020 15:14:02 +0900 (JST)
Subject: [ruby-changes:60880] 14e013cdbb (master): [ruby/rdoc] Drop old rubies
https://git.ruby-lang.org/ruby.git/commit/?id=14e013cdbb From 14e013cdbbd937ab229a929d8743f271c6f89ab2 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Mon, 20 Apr 2020 18:41:03 +0900 Subject: [ruby/rdoc] Drop old rubies * `RbConfig::CONFIG['ridir']` has been set since 1.9.2 * `ENV["HOME"]` has been defaulted to `USERPROFILE` since 1.9.0, and backported to 1.8.5 or later. https://github.com/ruby/rdoc/commit/a3a614e676 diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index f76721d..b1d5848 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -12,23 +12,12 @@ module RDoc::RI::Paths https://github.com/ruby/ruby/blob/trunk/lib/rdoc/ri/paths.rb#L12 version = RbConfig::CONFIG['ruby_version'] - BASE = if RbConfig::CONFIG.key? 'ridir' then - File.join RbConfig::CONFIG['ridir'], version - else - File.join RbConfig::CONFIG['datadir'], 'ri', version - end + BASE = File.join RbConfig::CONFIG['ridir'], version - homedir = begin - File.expand_path('~') + HOMEDIR = begin + File.expand_path('~/.rdoc') rescue ArgumentError end - - homedir ||= ENV['HOME'] || - ENV['USERPROFILE'] || ENV['HOMEPATH'] # for 1.8 compatibility - - HOMEDIR = if homedir then - File.join homedir, ".rdoc" - end #:startdoc: ## -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/