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

Use heredoc for multiline error and store untapped official taps check

Browse Source 
Review feedback on https://github.com/Homebrew/brew/pull/13581#pullrequestreview-1046232447
This commit is contained in:
Colin Dean 2022-07-21 13:19:54 -04:00
parent 5e56b9effe
commit e7052fad0d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/brew.rb
View File

@ -103,13 +103,14 @@ begin
possible_tap = OFFICIAL_CMD_TAPS.find { |_, cmds| cmds.include?(cmd) }
possible_tap = Tap.fetch(possible_tap.first) if possible_tap
if !possible_tap || possible_tap.installed? || Tap.untapped_official_taps.include?(possible_tap.name)
blocked_tap = possible_tap && Tap.untapped_official_taps.include?(possible_tap.name)
if !possible_tap ||
possible_tap.installed? ||
(blocked_tap = Tap.untapped_official_taps.include?(possible_tap.name))
if blocked_tap
[
"`brew #{cmd}` is unavailable because #{possible_tap.name} was manually untapped.",
"Run `brew tap #{possible_tap.name}` to reenable `brew #{cmd}`.",
].each { |ln| onoe ln }
onoe <<~EOS
`brew #{cmd}` is unavailable because #{possible_tap.name} was manually untapped.
Run `brew tap #{possible_tap.name}` to reenable `brew #{cmd}`.
EOS
end
# Check for cask explicitly because it's very common in old guides
odie "`brew cask` is no longer a `brew` command. Use `brew <command> --cask` instead." if cmd == "cask"