aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2014-02-22 17:15:15 +0000
committerMike McQuaid2014-02-22 17:15:15 +0000
commit0f2d1d7f72c2507f9e5a55e4c7b465affc2ea078 (patch)
tree401d9ca7719513efde2df43ecebcc5367eb103de /Library/Homebrew
parentac81d3b0d8a95ff7ea5738655d7dda79d98dcc4d (diff)
downloadbrew-0f2d1d7f72c2507f9e5a55e4c7b465affc2ea078.tar.bz2
bottle_version: add x264.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/bottle_version.rb4
-rw-r--r--Library/Homebrew/test/test_bottle_versions.rb5
2 files changed, 9 insertions, 0 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb
index 38b51005e..615980d83 100644
--- a/Library/Homebrew/bottle_version.rb
+++ b/Library/Homebrew/bottle_version.rb
@@ -7,6 +7,10 @@ class BottleVersion < Version
m = /-([\d\.]+-x86(_64)?)/.match(stem)
return m.captures.first unless m.nil?
+ # e.g. x264-r2197.4.mavericks.bottle.tar.gz
+ m = /(r\d+\.\d)/.match(stem)
+ return m.captures.first unless m.nil?
+
# e.g. ssh-copy-id-6.2p2.mountain_lion.bottle.tar.gz
# e.g. icu4c-52.1.mountain_lion.bottle.tar.gz
m = /(\d+\.(\d)+(p(\d)+)?)/.match(stem)
diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb
index 26efb1261..7968d1e19 100644
--- a/Library/Homebrew/test/test_bottle_versions.rb
+++ b/Library/Homebrew/test/test_bottle_versions.rb
@@ -20,4 +20,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase
assert_version_detected '52.1',
'/usr/local/icu4c-52.1.mavericks.bottle.tar.gz'
end
+
+ def test_x264_style
+ assert_version_detected 'r2197.4',
+ '/usr/local/x264-r2197.4.mavericks.bottle.tar.gz'
+ end
end