Prefer RbConfig.ruby over the 3.times fallback (#8691)
It seems saner to use RbConfig.ruby than using ruby in a random ancestor directory.
This commit is contained in:
parent
7a3a98e2be
commit
6c46ccf226
@ -15,8 +15,10 @@ 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)
|
||||||
|
RbConfig.ruby
|
||||||
|
else
|
||||||
ruby = "ruby"
|
ruby = "ruby"
|
||||||
exeext = RbConfig::CONFIG["EXEEXT"]
|
exeext = RbConfig::CONFIG["EXEEXT"]
|
||||||
rubyexe = (ruby + exeext if exeext and !exeext.empty?)
|
rubyexe = (ruby + exeext if exeext and !exeext.empty?)
|
||||||
@ -29,9 +31,6 @@ module EnvUtil
|
|||||||
end
|
end
|
||||||
ruby = File.join("..", ruby)
|
ruby = File.join("..", ruby)
|
||||||
end
|
end
|
||||||
if defined?(RbConfig.ruby)
|
|
||||||
RbConfig.ruby
|
|
||||||
else
|
|
||||||
"ruby"
|
"ruby"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user