diff --git a/Library/Homebrew/cmd/casks.sh b/Library/Homebrew/cmd/casks.sh index aa3a75cf2bb2e..b39285b1de3f9 100644 --- a/Library/Homebrew/cmd/casks.sh +++ b/Library/Homebrew/cmd/casks.sh @@ -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' } diff --git a/Library/Homebrew/cmd/formulae.sh b/Library/Homebrew/cmd/formulae.sh index ccf04ea0766b8..649af45c9e4ed 100644 --- a/Library/Homebrew/cmd/formulae.sh +++ b/Library/Homebrew/cmd/formulae.sh @@ -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' } diff --git a/Library/Homebrew/items.sh b/Library/Homebrew/items.sh index 838ef5f6e2363..4a655897315f9 100644 --- a/Library/Homebrew/items.sh +++ b/Library/Homebrew/items.sh @@ -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/_' \