From a3a614e676b272a42869c9fc550e6741024e1e44 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@ruby-lang.org> Date: Mon, 20 Apr 2020 18:41:03 +0900 Subject: [PATCH] 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. --- lib/rdoc/ri/paths.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index f76721d318..b1d584878b 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -12,23 +12,12 @@ module RDoc::RI::Paths 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: ##