diff options
| author | Mike McQuaid | 2017-10-28 19:48:44 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-11-03 14:50:17 +0000 |
| commit | f0b25b5482ba43611c77d94c2326c35f14b6de3d (patch) | |
| tree | 8128f8f2c0af1bb5f9c9fecd0eb8920986a548d8 | |
| parent | 5de7ec394bf9f24423e0b380b39c6c2801eca81e (diff) | |
| download | brew-f0b25b5482ba43611c77d94c2326c35f14b6de3d.tar.bz2 | |
requirement: convert Cellar path to opt path.
| -rw-r--r-- | Library/Homebrew/requirement.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index dfe68c19c..95807d5ae 100644 --- a/Library/Homebrew/requirement.rb +++ b/Library/Homebrew/requirement.rb @@ -77,7 +77,11 @@ class Requirement def satisfied_result_parent return unless @satisfied_result.is_a?(Pathname) - @satisfied_result.resolved_path.parent + parent = @satisfied_result.resolved_path.parent + if parent.to_s =~ %r{^#{Regexp.escape(HOMEBREW_CELLAR)}/([\w+-.@]+)/[^/]+/(s?bin)/?$} + parent = HOMEBREW_PREFIX/"opt/#{Regexp.last_match(1)}/#{Regexp.last_match(2)}" + end + parent end # Overriding #modify_build_environment is deprecated. |