1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefer RbConfig.ruby over the 3.times fallback (#8691)

Browse Source 
It seems saner to use RbConfig.ruby than using ruby in a random ancestor
directory.
This commit is contained in:
Takashi Kokubun 2023-10-17 17:57:39 -07:00 committed by GitHub
parent 7a3a98e2be
commit 6c46ccf226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tool/lib/envutil.rb
View File

@ -15,23 +15,22 @@ end
module EnvUtil module EnvUtil
def rubybin def rubybin
if ruby = ENV["RUBY"] if ruby = ENV["RUBY"]
return ruby ruby
end elsif defined?(RbConfig.ruby)
ruby = "ruby"
exeext = RbConfig::CONFIG["EXEEXT"]
rubyexe = (ruby + exeext if exeext and !exeext.empty?)
3.times do
if File.exist? ruby and File.executable? ruby and !File.directory? ruby
return File.expand_path(ruby)
end
if rubyexe and File.exist? rubyexe and File.executable? rubyexe
return File.expand_path(rubyexe)
end
ruby = File.join("..", ruby)
end
if defined?(RbConfig.ruby)
RbConfig.ruby RbConfig.ruby
else else
ruby = "ruby"
exeext = RbConfig::CONFIG["EXEEXT"]
rubyexe = (ruby + exeext if exeext and !exeext.empty?)
3.times do
if File.exist? ruby and File.executable? ruby and !File.directory? ruby
return File.expand_path(ruby)
end
if rubyexe and File.exist? rubyexe and File.executable? rubyexe
return File.expand_path(rubyexe)
end
ruby = File.join("..", ruby)
end
"ruby" "ruby"
end end
end end