Merge pull request #14164 from ThatsJustCheesy/brew-casks-root-formulae

Prevent `brew casks` from finding formulae at tap root
This commit is contained in:
Mike McQuaid 2022-11-21 14:31:24 +00:00 committed by GitHub
commit 9637c0fbcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -8,5 +8,5 @@
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
homebrew-casks() {
homebrew-items 'Formula' 's|/Casks/|/|' '^homebrew/cask'
homebrew-items '*/Casks/*\.rb' '' 's|/Casks/|/|' '^homebrew/cask'
}

View File

@ -8,5 +8,5 @@
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
homebrew-formulae() {
homebrew-items 'Casks' 's|/Formula/|/|' '^homebrew/core'
homebrew-items '*\.rb' 'Casks' 's|/Formula/|/|' '^homebrew/core'
}

View File

@ -1,9 +1,10 @@
homebrew-items() {
local items
local sed_extended_regex_flag
local find_filter="$1"
local sed_filter="$2"
local grep_filter="$3"
local find_include_filter="$1"
local find_exclude_filter="$2"
local sed_filter="$3"
local grep_filter="$4"
# HOMEBREW_MACOS is set by brew.sh
# shellcheck disable=SC2154
@ -19,14 +20,14 @@ homebrew-items() {
items="$(
find "${HOMEBREW_REPOSITORY}/Library/Taps" \
-type d \( \
-name "${find_filter}" -o \
-name "${find_exclude_filter}" -o \
-name cmd -o \
-name .github -o \
-name lib -o \
-name spec -o \
-name vendor \
\) \
-prune -false -o -name '*\.rb' |
-prune -false -o -path "${find_include_filter}" |
sed "${sed_extended_regex_flag}" \
-e 's/\.rb//g' \
-e 's_.*/Taps/(.*)/(home|linux)brew-_\1/_' \