aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2014-02-19 16:53:18 -0500
committerJack Nagel2014-02-19 16:53:18 -0500
commit7591b79d7de68fcf2c3a1cbba4afaf63992ebc29 (patch)
tree7272af3f1e5569c7580936110cad582cccee3a23 /Library/Homebrew
parentf43bb0c292963559a9a1e8d40948305ef0b9d05a (diff)
downloadbrew-7591b79d7de68fcf2c3a1cbba4afaf63992ebc29.tar.bz2
Push expand_path call down into FromPathLoader
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/formula.rb2
-rw-r--r--Library/Homebrew/formulary.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 3792e0a7b..a17f114f8 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -33,7 +33,7 @@ class Formula
def initialize name='__UNKNOWN__', path=nil
@name = name
# If we got an explicit path, use that, else determine from the name
- @path = path.nil? ? self.class.path(name) : Pathname.new(path).expand_path
+ @path = path.nil? ? self.class.path(name) : path
@homepage = self.class.homepage
set_spec :stable
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index c4e1be1c7..b733242e8 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -105,7 +105,7 @@ class Formulary
# in our codebase will require an exact and fullpath.
path = "#{path}.rb" unless path =~ /\.rb$/
- @path = Pathname.new(path)
+ @path = Pathname.new(path).expand_path
@name = @path.stem
end