diff options
| author | Jack Nagel | 2013-10-25 17:29:36 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-10-25 17:29:36 -0500 |
| commit | e67286369ebbbfab33109df3743bbbd461fca9e6 (patch) | |
| tree | 58da76d2625d281c8f34e97bf8be25cd36afbc35 | |
| parent | ed3343565a6b02f85d6e0a21b8f64be81c1cd0a3 (diff) | |
| download | brew-e67286369ebbbfab33109df3743bbbd461fca9e6.tar.bz2 | |
Stop coercing MACOS_VERSION to a float
| -rw-r--r-- | Library/Homebrew/global.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/testing_env.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 61625b6ae..c65bf50ba 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -71,10 +71,10 @@ RUBY_PATH = RUBY_BIN + RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG[ if RUBY_PLATFORM =~ /darwin/ MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp - MACOS_VERSION = MACOS_FULL_VERSION[/10\.\d+/].to_f + MACOS_VERSION = MACOS_FULL_VERSION[/10\.\d+/] OS_VERSION = "Mac OS X #{MACOS_FULL_VERSION}" else - MACOS_FULL_VERSION = MACOS_VERSION = 0 + MACOS_FULL_VERSION = MACOS_VERSION = "0" OS_VERSION = RUBY_PLATFORM end diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index a7b25aa20..4a3da7e14 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -30,7 +30,7 @@ RUBY_BIN = Pathname.new(RbConfig::CONFIG['bindir']) RUBY_PATH = RUBY_BIN + RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT'] MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp -MACOS_VERSION = ENV.fetch('MACOS_VERSION') { MACOS_FULL_VERSION[/10\.\d+/] }.to_f +MACOS_VERSION = ENV.fetch('MACOS_VERSION') { MACOS_FULL_VERSION[/10\.\d+/] } ORIGINAL_PATHS = ENV['PATH'].split(File::PATH_SEPARATOR).map{ |p| Pathname.new(p).expand_path rescue nil }.compact.freeze |