From 28a20b70fc6874e6b3329e729bd199816281ed4a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 11 Oct 2013 08:40:08 +0100 Subject: [PATCH] icu4c: add bottle regex. --- Library/Homebrew/bottle_version.rb | 3 ++- Library/Homebrew/test/test_bottle_versions.rb | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index 4778632970..0711dc3494 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -8,7 +8,8 @@ class BottleVersion < Version return m.captures.first unless m.nil? # e.g. ssh-copy-id-6.2p2.bottle.tar.gz - m = /(\d\.(\d)+(p(\d)+)?)/.match(stem) + # e.g. icu4c-52.1.bottle.tar.gz + m = /(\d+\.(\d)+(p(\d)+)?)/.match(stem) return m.captures.first unless m.nil? super diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index b0b061d679..7624f448a3 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -15,4 +15,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase assert_version_detected '6.2p2', '/usr/local/ssh-copy-id-6.2p2.mountain_lion.bottle.tar.gz' end + + def test_icu4c_style + assert_version_detected '52.1', + '/usr/local/icu4c-52.1.bottle.tar.gz' + end end