From 83f2ee5aeabc55bc0806a7be168eaa272dc84ca5 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 9 Jun 2014 21:36:36 -0500 Subject: Use RbConfig.ruby if it's available --- Library/Homebrew/test/testing_env.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index c3dcf8957..f0bd1726d 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -29,8 +29,14 @@ HOMEBREW_VERSION = '0.9-test' require 'tap_constants' -RUBY_BIN = Pathname.new(RbConfig::CONFIG['bindir']) -RUBY_PATH = RUBY_BIN + RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT'] +if RbConfig.respond_to?(:ruby) + RUBY_PATH = Pathname.new(RbConfig.ruby) +else + RUBY_PATH = Pathname.new(RbConfig::CONFIG["bindir"]).join( + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"] + ) +end +RUBY_BIN = RUBY_PATH.dirname MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp MACOS_VERSION = ENV.fetch('MACOS_VERSION') { MACOS_FULL_VERSION[/10\.\d+/] } -- cgit v1.2.3