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

canonical_name can resolve taps

Browse Source
This commit is contained in:
Max Howell 2012-03-04 14:17:54 +00:00
parent 903b1167a6
commit 3f25dd60fa
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,14 +30,14 @@ module Homebrew extend self
if $?.success? if $?.success?
gitignores << relative_pathname.basename.to_s gitignores << relative_pathname.basename.to_s
else else
opoo "#{relative_pathname.basename, ".rb"} conflicts" opoo "#{relative_pathname.basename('.rb')} conflicts"
end end
end end
tf = Tempfile.new("brew-tap") tf = Tempfile.new("brew-tap")
tf.write(gitignores.uniq.join("\n")) tf.write(gitignores.uniq.join("\n"))
tf.close tf.close
mv tf.path, "#{HOMEBREW_PREFIX}/Library/Formula/.gitignore" mv tf.path, "#{HOMEBREW_LIBRARY}/Formula/.gitignore"
end end
private private

9
Library/Homebrew/formula.rb
View File

@ -283,7 +283,6 @@ class Formula
end end
def self.canonical_name name def self.canonical_name name
# Cast pathnames to strings.
name = name.to_s if name.kind_of? Pathname name = name.to_s if name.kind_of? Pathname
formula_with_that_name = HOMEBREW_REPOSITORY+"Library/Formula/#{name}.rb" formula_with_that_name = HOMEBREW_REPOSITORY+"Library/Formula/#{name}.rb"
@ -291,7 +290,13 @@ class Formula
possible_cached_formula = HOMEBREW_CACHE_FORMULA+"#{name}.rb" possible_cached_formula = HOMEBREW_CACHE_FORMULA+"#{name}.rb"
if name.include? "/" if name.include? "/"
# Don't resolve paths or URLs if name =~ %r{(.+)/(.+)/(.+)}
tapd = HOMEBREW_REPOSITORY/"Library/Taps/#$1-#$2"
tapd.find_formula do |relative_pathname|
return "#{tapd}/#{relative_pathname}" if relative_pathname.stem.to_s == $3
end if tapd.directory?
end
# Otherwise don't resolve paths or URLs
name name
elsif formula_with_that_name.file? and formula_with_that_name.readable? elsif formula_with_that_name.file? and formula_with_that_name.readable?
name name