mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
cmd/{casks,formulae}: handle sharding.
- Allow subdirectories inside `Casks`/`Formula` directories. - DRY up repeated code with some variables.
This commit is contained in:
parent
73b40bc351
commit
21f586c4bf
@ -8,6 +8,10 @@
|
|||||||
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
|
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
|
||||||
|
|
||||||
homebrew-casks() {
|
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
|
# HOMEBREW_CACHE is set by brew.sh
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
|
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
|
||||||
@ -16,9 +20,9 @@ homebrew-casks() {
|
|||||||
{
|
{
|
||||||
cat "${HOMEBREW_CACHE}/api/cask_names.txt"
|
cat "${HOMEBREW_CACHE}/api/cask_names.txt"
|
||||||
echo
|
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
|
} | sort -uf
|
||||||
else
|
else
|
||||||
homebrew-items '*/Casks/*\.rb' '^\b$' 's|/Casks/|/|' '^homebrew/cask'
|
homebrew-items "${find_include_filter}" '^\b$' "${sed_filter}" "${grep_filter}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,10 @@
|
|||||||
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
|
source "${HOMEBREW_LIBRARY}/Homebrew/items.sh"
|
||||||
|
|
||||||
homebrew-formulae() {
|
homebrew-formulae() {
|
||||||
|
local find_include_filter='*\.rb'
|
||||||
|
local sed_filter='s|/Formula/(.+/)?|/|'
|
||||||
|
local grep_filter='^homebrew/core'
|
||||||
|
|
||||||
# HOMEBREW_CACHE is set by brew.sh
|
# HOMEBREW_CACHE is set by brew.sh
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
|
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
|
||||||
@ -16,9 +20,9 @@ homebrew-formulae() {
|
|||||||
{
|
{
|
||||||
cat "${HOMEBREW_CACHE}/api/formula_names.txt"
|
cat "${HOMEBREW_CACHE}/api/formula_names.txt"
|
||||||
echo
|
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
|
} | sort -uf
|
||||||
else
|
else
|
||||||
homebrew-items '*\.rb' '.*Casks(/.*|$)' 's|/Formula/|/|' '^homebrew/core'
|
homebrew-items "${find_include_filter}" '.*Casks(/.*|$)' "${sed_filter}" "${grep_filter}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user