diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/ri/paths.rb | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Fri Apr 2 13:51:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): expand_path deals with + platform dependent envirionments. reapplied r21312. + Fri Apr 2 12:52:25 2010 NAKAMURA Usaku <usa@ruby-lang.org> * lib/rdoc/parser.rb (binary?): regression. diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index 178142d35f..7090a58d44 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -13,12 +13,8 @@ module RDoc::RI::Paths base = File.join RbConfig::CONFIG['datadir'], "ri", version SYSDIR = File.join base, "system" SITEDIR = File.join base, "site" - homedir = File.expand_path('~') || - ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH'] + HOMEDIR = (File.expand_path("~/.rdoc") rescue nil) - HOMEDIR = if homedir then - File.join homedir, ".rdoc" - end #:startdoc: @gemdirs = nil |