Skip to content

Commit fa68f3d

Browse files
committed
Add Formula#tap_path method for theoretical formula file location in tap
1 parent 209b66d commit fa68f3d

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Library/Homebrew/dev-cmd/bottle.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,8 @@ def bottle_formula(formula)
661661
"formula" => {
662662
"name" => formula.name,
663663
"pkg_version" => formula.pkg_version.to_s,
664-
"path" => formula.path.to_s.delete_prefix("#{HOMEBREW_REPOSITORY}/"),
665-
"tap_git_path" => formula.path.to_s.delete_prefix("#{tap_path}/"),
664+
"path" => formula.tap_path.to_s.delete_prefix("#{HOMEBREW_REPOSITORY}/"),
665+
"tap_git_path" => formula.tap_path.to_s.delete_prefix("#{tap_path}/"),
666666
"tap_git_revision" => tap_git_revision,
667667
"tap_git_remote" => tap_git_remote,
668668
# descriptions can contain emoji. sigh.

Library/Homebrew/formula.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,13 @@ def installed_alias_name = installed_alias_path&.basename&.to_s
426426
sig { returns(T.nilable(String)) }
427427
def full_installed_alias_name = full_name_with_optional_tap(installed_alias_name)
428428

429+
sig { returns(Pathname) }
430+
def tap_path
431+
return path unless (t = tap)
432+
433+
t.new_formula_path(name)
434+
end
435+
429436
# The path that was specified to find this formula.
430437
sig { returns(T.nilable(Pathname)) }
431438
def specified_path

Library/Homebrew/formula_versions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class FormulaVersions
2020
sig { params(formula: Formula).void }
2121
def initialize(formula)
2222
@name = formula.name
23-
@path = formula.path
23+
@path = formula.tap_path
2424
@repository = T.must(formula.tap).path
2525
@relative_path = @path.relative_path_from(repository).to_s
2626
# Also look at e.g. older homebrew-core paths before sharding.

0 commit comments

Comments
 (0)