aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ARGV.rb4
-rw-r--r--Library/Homebrew/extend/ENV/shared.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 996654352..c241d1fe1 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -17,7 +17,7 @@ module HomebrewArgvExtension
require 'keg'
require 'formula'
@kegs ||= downcased_unique_named.collect do |name|
- canonical_name = Formula.canonical_name(name)
+ canonical_name = Formulary.canonical_name(name)
rack = HOMEBREW_CELLAR/canonical_name
dirs = rack.directory? ? rack.subdirs : []
@@ -32,7 +32,7 @@ module HomebrewArgvExtension
Keg.new(linked_keg_ref.resolved_path)
elsif dirs.length == 1
Keg.new(dirs.first)
- elsif (prefix = Formula.factory(canonical_name).prefix).directory?
+ elsif (prefix = Formulary.factory(canonical_name).prefix).directory?
Keg.new(prefix)
else
raise MultipleVersionsInstalledError.new(name)
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index 57628e920..5a91c1574 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -171,7 +171,7 @@ module SharedEnvExtension
# ld64 is a newer linker provided for Xcode 2.5
def ld64
- ld64 = Formula.factory('ld64')
+ ld64 = Formulary.factory('ld64')
self['LD'] = ld64.bin/'ld'
append "LDFLAGS", "-B#{ld64.bin}/"
end