diff options
| author | Jack Nagel | 2014-02-19 16:53:18 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-02-19 16:53:18 -0500 |
| commit | 91dcb3bdc321732d51cea0df68e97ce6786fd10e (patch) | |
| tree | 0070f82397beeadb9bf620d2a0e166c94027b9ff /Library/Homebrew | |
| parent | 2d91efdc06d2f031d4d01d07d33027970384b09d (diff) | |
| download | homebrew-91dcb3bdc321732d51cea0df68e97ce6786fd10e.tar.bz2 | |
Push expand_path call down into FromPathLoader
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formulary.rb | 2 |
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 |
