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

Prevent brew casks from finding formulae at tap root

Browse Source
This commit is contained in:
Ian Gregory 2022-11-20 16:22:18 -05:00
parent 759ab2d0bd
commit 9013ca2a22
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/casks.sh
View File

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

2
Library/Homebrew/cmd/formulae.sh
View File

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

11
Library/Homebrew/items.sh
View File

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