admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cmd/untap: fix installed formula & cask check

Browse Source 
This wasn't working before for a few reasons.

1. It never got past the installed name check because the
installed name sets had short names and the tap names were
long names including the tap namespace too. Now we just trim the
long name before comparing it to the installed name set.

Before:

```
["name"].include?("tap/full/name") # always false
```

After:

```
["name"].include("tap/full/name".split("/").last) # sometimes true
```

2. The names we were trying to load formulae and casks with
were incorrect.

Before:

```
tap = Tap.fetch("homebrew/cask-versions")
token = "homebrew/cask-versions/token"

cask = Cask::CaskLoader.load("#{tap}/#{token}")
```

After:

```
token = "homebrew/cask-versions/token"
cask = CaskCaskLoader.load(token)
```
This commit is contained in:
apainintheneck 2024-03-09 23:38:27 -08:00
parent d3da1bbf06
commit 819af3cbdd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/untap.rb
View File

@ -31,10 +31,10 @@ module Homebrew
installed_tap_formulae = tap.formula_names.filter_map do |formula_name|
# initialise lazily in case there's no formulae in this tap
installed_formula_names ||= Set.new(Formula.installed_formula_names)
next unless installed_formula_names.include?(formula_name)
next unless installed_formula_names.include?(formula_name.split("/").last)
formula = begin
Formulary.factory("#{tap.name}/#{formula_name}")
Formulary.factory(formula_name)
rescue
# Don't blow up because of a single unavailable formula.
next
@ -49,10 +49,10 @@ module Homebrew
installed_tap_casks = tap.cask_tokens.filter_map do |cask_token|
# initialise lazily in case there's no casks in this tap
installed_cask_tokens ||= Set.new(Cask::Caskroom.tokens)
next unless installed_cask_tokens.include?(cask_token)
next unless installed_cask_tokens.include?(cask_token.split("/").last)
cask = begin
Cask::CaskLoader.load("#{tap.name}/#{cask_token}")
Cask::CaskLoader.load(cask_token)
rescue
# Don't blow up because of a single unavailable cask.
next