From f8fb74ff76f4f6b779bcaccee94bdb442f2ea51a Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 6 Jul 2014 11:24:24 -0500 Subject: Escape paths in regexps --- Library/Homebrew/cmd/tap.rb | 2 +- Library/Homebrew/cmd/update.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb index d13921572..3fb5ca65c 100644 --- a/Library/Homebrew/cmd/tap.rb +++ b/Library/Homebrew/cmd/tap.rb @@ -123,7 +123,7 @@ module Homebrew case path.to_s when HOMEBREW_TAP_PATH_REGEX "#$1/#$2/#{File.basename($3, '.rb')}" - when %r{^#{HOMEBREW_LIBRARY}/Formula/(.+)} + when %r{^#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Formula/(.+)}o "Homebrew/homebrew/#{File.basename($1, '.rb')}" else nil diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 7bced13a9..b1ee8d8fe 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -266,7 +266,7 @@ class Report def select_formula key fetch(key, []).map do |path| case path.to_s - when Regexp.new(HOMEBREW_LIBRARY + "/Formula") + when %r{^#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Formula}o path.basename(".rb").to_s when HOMEBREW_TAP_PATH_REGEX "#$1/#{$2.sub("homebrew-", "")}/#{path.basename(".rb")}" -- cgit v1.2.3