admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

tap: change core formula tap naming.

Browse Source
This commit is contained in:
Mike McQuaid 2013-12-14 18:15:59 +00:00
parent f459245e6d
commit 2afa1c3b86
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/tap.rb
View File

@ -68,7 +68,7 @@ module Homebrew extend self
else else
to = to.realpath if to.exist? to = to.realpath if to.exist?
# Whitelist gcc42 temporarily until Mavericks/Xcode 5.0 issues are resolved. # Whitelist gcc42 temporarily until Mavericks/Xcode 5.0 issues are resolved.
unless to.tap_ref == 'mxcl/master/apple-gcc42' unless to.tap_ref == 'Homebrew/homebrew/apple-gcc42'
opoo "Could not tap #{Tty.white}#{from.tap_ref}#{Tty.reset} over #{Tty.white}#{to.tap_ref}#{Tty.reset}" opoo "Could not tap #{Tty.white}#{from.tap_ref}#{Tty.reset} over #{Tty.white}#{to.tap_ref}#{Tty.reset}"
end end
end end
@ -121,7 +121,7 @@ class Pathname
when %r{^#{HOMEBREW_LIBRARY}/Taps/([a-z\-_]+)-(\w+)/(.+)} when %r{^#{HOMEBREW_LIBRARY}/Taps/([a-z\-_]+)-(\w+)/(.+)}
"#$1/#$2/#{File.basename($3, '.rb')}" "#$1/#$2/#{File.basename($3, '.rb')}"
when %r{^#{HOMEBREW_LIBRARY}/Formula/(.+)} when %r{^#{HOMEBREW_LIBRARY}/Formula/(.+)}
"mxcl/master/#{File.basename($1, '.rb')}" "Homebrew/homebrew/#{File.basename($1, '.rb')}"
else else
nil nil
end end

2
Library/Homebrew/formula.rb
View File

@ -451,7 +451,7 @@ class Formula
if path.realpath.to_s =~ HOMEBREW_TAP_DIR_REGEX if path.realpath.to_s =~ HOMEBREW_TAP_DIR_REGEX
"#$1/#$2" "#$1/#$2"
elsif core_formula? elsif core_formula?
"mxcl/master" "Homebrew/homebrew"
else else
"path or URL" "path or URL"
end end