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

[ruby/irb] Do not make non-existent XDG directory on start

Browse source 
(https://github.com/ruby/irb/pull/357)


298b134792
This commit is contained in:
Nobuyoshi Nakada 2022-03-31 12:51:04 +09:00 • committed by git
parent 56c97a6621
commit 4021c6565f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/irb/init.rb
View file

@ -379,11 +379,9 @@ module IRB # :nodoc:
end end
if xdg_config_home = ENV["XDG_CONFIG_HOME"] if xdg_config_home = ENV["XDG_CONFIG_HOME"]
irb_home = File.join(xdg_config_home, "irb") irb_home = File.join(xdg_config_home, "irb")
unless File.exist? irb_home if File.directory?(irb_home)
require 'fileutils' yield proc{|rc| irb_home + "/irb#{rc}"}
FileUtils.mkdir_p irb_home
end end
yield proc{|rc| irb_home + "/irb#{rc}"}
end end
if home = ENV["HOME"] if home = ENV["HOME"]
yield proc{|rc| home+"/.irb#{rc}"} yield proc{|rc| home+"/.irb#{rc}"}

3
test/irb/test_init.rb
View file

@ -36,13 +36,16 @@ module TestIRB
def test_rc_file def test_rc_file
tmpdir = @tmpdir tmpdir = @tmpdir
Dir.chdir(tmpdir) do Dir.chdir(tmpdir) do
ENV["XDG_CONFIG_HOME"] = "#{tmpdir}/xdg"
IRB.conf[:RC_NAME_GENERATOR] = nil IRB.conf[:RC_NAME_GENERATOR] = nil
assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file) assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history")) assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
assert_file.not_exist?(tmpdir+"/xdg")
IRB.conf[:RC_NAME_GENERATOR] = nil IRB.conf[:RC_NAME_GENERATOR] = nil
FileUtils.touch(tmpdir+"/.irb#{IRB::IRBRC_EXT}") FileUtils.touch(tmpdir+"/.irb#{IRB::IRBRC_EXT}")
assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file) assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history")) assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
assert_file.not_exist?(tmpdir+"/xdg")
end end
end end