diff options
| author | Jack Nagel | 2014-04-05 17:41:36 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-05 17:41:36 -0500 |
| commit | fc39b7cb9561b8d901e32a38fdaff406faf4c32b (patch) | |
| tree | 136ca48fbc29ac3bcbde3dd2f435999900e83296 /Library | |
| parent | 78ac9fe72a8210d7fca6287ac40d235a52e59991 (diff) | |
| download | homebrew-fc39b7cb9561b8d901e32a38fdaff406faf4c32b.tar.bz2 | |
Prefer File.extname to regexp
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formulary.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index c36635732..232e2a108 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -115,7 +115,7 @@ class Formulary def initialize path # require allows filenames to drop the .rb extension, but everything else # in our codebase will require an exact and fullpath. - path = "#{path}.rb" unless path =~ /\.rb$/ + path = "#{path}.rb" unless File.extname(path) == ".rb" path = Pathname.new(path).expand_path super path.stem, path end @@ -179,7 +179,7 @@ class Formulary elsif name_or_path.include? "/" # If name was a path or mapped to a cached formula f = FromPathLoader.new(name_or_path) - elsif name_or_path =~ /\.rb$/ + elsif File.extname(name_or_path) == ".rb" f = FromPathLoader.new(File.expand_path(name_or_path)) else f = StandardLoader.new(name_or_path) |
