diff options
| -rw-r--r-- | Library/Homebrew/cmd/create.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/edit.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/create.rb b/Library/Homebrew/cmd/create.rb index d92dc0b00..dc39fc381 100644 --- a/Library/Homebrew/cmd/create.rb +++ b/Library/Homebrew/cmd/create.rb @@ -33,7 +33,7 @@ module Homebrew extend self end if Formula.aliases.include? fc.name - realname = Formula.caniconical_name fc.name + realname = Formula.canonical_name fc.name raise <<-EOS.undent The formula #{realname} is already aliased to #{fc.name} Please check that you are not creating a duplicate. diff --git a/Library/Homebrew/cmd/edit.rb b/Library/Homebrew/cmd/edit.rb index 079f561a0..5436dc975 100644 --- a/Library/Homebrew/cmd/edit.rb +++ b/Library/Homebrew/cmd/edit.rb @@ -13,7 +13,7 @@ module Homebrew extend self else # Don't use ARGV.formulae as that will throw if the file doesn't parse paths = ARGV.named.map do |name| - HOMEBREW_REPOSITORY+"Library/Formula/#{Formula.caniconical_name name}.rb" + HOMEBREW_REPOSITORY+"Library/Formula/#{Formula.canonical_name name}.rb" end unless ARGV.force? paths.each do |path| diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 4fbf087af..eef3cbc0c 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -18,7 +18,7 @@ module HomebrewArgvExtension require 'keg' require 'formula' @kegs ||= downcased_unique_named.collect do |name| - d = HOMEBREW_CELLAR+Formula.caniconical_name(name) + d = HOMEBREW_CELLAR+Formula.canonical_name(name) dirs = d.children.select{ |pn| pn.directory? } rescue [] raise NoSuchKegError.new(name) if not d.directory? or dirs.length == 0 raise MultipleVersionsInstalledError.new(name) if dirs.length > 1 diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index fb9542889..8fdd243ed 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -348,7 +348,7 @@ class Formula Dir["#{HOMEBREW_REPOSITORY}/Library/Aliases/*"].map{ |f| File.basename f }.sort end - def self.caniconical_name name + def self.canonical_name name formula_with_that_name = HOMEBREW_REPOSITORY+"Library/Formula/#{name}.rb" possible_alias = HOMEBREW_REPOSITORY+"Library/Aliases"+name if name.include? "/" @@ -390,7 +390,7 @@ class Formula install_type = :from_path target_file = path.to_s else - name = Formula.caniconical_name(name) + name = Formula.canonical_name(name) # For names, map to the path and then require require Formula.path(name) install_type = :from_name |