mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-09-06 09:11:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix comparing OS X version when it has 3 components

Browse source
This commit is contained in:
Mislav Marohnić 2014-10-31 04:08:00 +01:00
parent de155dd12b
commit fc6e0ae69d
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/ruby-build
View file

@ -89,10 +89,9 @@ os_information() {
# 10.9 -> 1009 # 10.9 -> 1009
# 10.10 -> 1010 # 10.10 -> 1010
osx_version() { osx_version() {
local ver="$(sw_vers -productVersion)" local -a ver
local major="${ver%.*}" IFS=. ver=( `sw_vers -productVersion` )
local minor="${ver#*.}" echo $(( ${ver[0]}*100 + ${ver[1]} ))
echo $(( major*100 + minor ))
} }
build_failed() { build_failed() {

2
test/compiler.bats
View file

@ -8,7 +8,7 @@ export -n CC
@test "require_gcc on OS X 10.9" { @test "require_gcc on OS X 10.9" {
stub uname '-s : echo Darwin' stub uname '-s : echo Darwin'
stub sw_vers '-productVersion : echo 10.9' stub sw_vers '-productVersion : echo 10.9.5'
stub gcc '--version : echo 4.2.1' stub gcc '--version : echo 4.2.1'
run_inline_definition <<DEF run_inline_definition <<DEF