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

Merge pull request #15706 from MikeMcQuaid/casks-formulae-sharing

Browse Source 
cmd/{casks,formulae}: handle sharding.
This commit is contained in:
Mike McQuaid 2023-07-18 13:13:53 +01:00 committed by GitHub
commit 060efa0be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,10 @@
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
homebrew-casks() {
local find_include_filter='*/Casks/*\.rb'
local sed_filter='s|/Casks/(.+/)?|/|'
local grep_filter='^homebrew/cask'
# HOMEBREW_CACHE is set by brew.sh
# shellcheck disable=SC2154
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
@ -16,9 +20,9 @@ homebrew-casks() {
{
cat "${HOMEBREW_CACHE}/api/cask_names.txt"
echo
homebrew-items '*/Casks/*\.rb' '.*/homebrew/homebrew-cask/.*' 's|/Casks/|/|' '^homebrew/cask'
homebrew-items "${find_include_filter}" '.*/homebrew/homebrew-cask/.*' "${sed_filter}" "${grep_filter}"
} | sort -uf
else
homebrew-items '*/Casks/*\.rb' '^\b$' 's|/Casks/|/|' '^homebrew/cask'
homebrew-items "${find_include_filter}" '^\b$' "${sed_filter}" "${grep_filter}"
fi
}

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

@ -8,6 +8,10 @@
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
homebrew-formulae() {
local find_include_filter='*\.rb'
local sed_filter='s|/Formula/(.+/)?|/|'
local grep_filter='^homebrew/core'
# HOMEBREW_CACHE is set by brew.sh
# shellcheck disable=SC2154
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
@ -16,9 +20,9 @@ homebrew-formulae() {
{
cat "${HOMEBREW_CACHE}/api/formula_names.txt"
echo
homebrew-items '*\.rb' '.*Casks(/.*|$)|.*/homebrew/homebrew-core/.*' 's|/Formula/|/|' '^homebrew/core'
homebrew-items "${find_include_filter}" '.*Casks(/.*|$)|.*/homebrew/homebrew-core/.*' "${sed_filter}" "${grep_filter}"
} | sort -uf
else
homebrew-items '*\.rb' '.*Casks(/.*|$)' 's|/Formula/|/|' '^homebrew/core'
homebrew-items "${find_include_filter}" '.*Casks(/.*|$)' "${sed_filter}" "${grep_filter}"
fi
}