style: fix inconsistent code style for shell scripts by runing brew style --fix

This commit is contained in:
XuehaiPan 2021-09-16 01:08:02 +08:00
parent bd8db0737d
commit 43377a3e5e
7 changed files with 97 additions and 59 deletions

View File

@ -9,7 +9,7 @@ HOMEBREW_PROCESSOR="$(uname -m)"
HOMEBREW_SYSTEM="$(uname -s)"
case "${HOMEBREW_SYSTEM}" in
Darwin) HOMEBREW_MACOS="1" ;;
Linux) HOMEBREW_LINUX="1" ;;
Linux) HOMEBREW_LINUX="1" ;;
esac
# If we're running under macOS Rosetta 2, and it was requested by setting
@ -56,15 +56,42 @@ HOMEBREW_TEMP="${HOMEBREW_TEMP:-${HOMEBREW_DEFAULT_TEMP}}"
# HOMEBREW_LIBRARY set by bin/brew
# shellcheck disable=SC2249,SC2154
case "$*" in
--cellar) echo "${HOMEBREW_CELLAR}"; exit 0 ;;
--repository | --repo) echo "${HOMEBREW_REPOSITORY}"; exit 0 ;;
--caskroom) echo "${HOMEBREW_PREFIX}/Caskroom"; exit 0 ;;
--cache) echo "${HOMEBREW_CACHE}"; exit 0 ;;
shellenv) source "${HOMEBREW_LIBRARY}/Homebrew/cmd/shellenv.sh"; homebrew-shellenv; exit 0 ;;
formulae) source "${HOMEBREW_LIBRARY}/Homebrew/cmd/formulae.sh"; homebrew-formulae; exit 0 ;;
casks) source "${HOMEBREW_LIBRARY}/Homebrew/cmd/casks.sh"; homebrew-casks; exit 0 ;;
--cellar)
echo "${HOMEBREW_CELLAR}"
exit 0
;;
--repository | --repo)
echo "${HOMEBREW_REPOSITORY}"
exit 0
;;
--caskroom)
echo "${HOMEBREW_PREFIX}/Caskroom"
exit 0
;;
--cache)
echo "${HOMEBREW_CACHE}"
exit 0
;;
shellenv)
source "${HOMEBREW_LIBRARY}/Homebrew/cmd/shellenv.sh"
homebrew-shellenv
exit 0
;;
formulae)
source "${HOMEBREW_LIBRARY}/Homebrew/cmd/formulae.sh"
homebrew-formulae
exit 0
;;
casks)
source "${HOMEBREW_LIBRARY}/Homebrew/cmd/casks.sh"
homebrew-casks
exit 0
;;
# falls back to cmd/prefix.rb on a non-zero return
--prefix*) source "${HOMEBREW_LIBRARY}/Homebrew/prefix.sh"; homebrew-prefix "$@" && exit 0 ;;
--prefix*)
source "${HOMEBREW_LIBRARY}/Homebrew/prefix.sh"
homebrew-prefix "$@" && exit 0
;;
esac
#####
@ -611,22 +638,22 @@ HOMEBREW_ARG_COUNT="$#"
HOMEBREW_COMMAND="$1"
shift
case "${HOMEBREW_COMMAND}" in
ls) HOMEBREW_COMMAND="list" ;;
homepage) HOMEBREW_COMMAND="home" ;;
-S) HOMEBREW_COMMAND="search" ;;
up) HOMEBREW_COMMAND="update" ;;
ln) HOMEBREW_COMMAND="link" ;;
instal) HOMEBREW_COMMAND="install" ;; # gem does the same
uninstal) HOMEBREW_COMMAND="uninstall" ;;
rm) HOMEBREW_COMMAND="uninstall" ;;
remove) HOMEBREW_COMMAND="uninstall" ;;
configure) HOMEBREW_COMMAND="diy" ;;
abv) HOMEBREW_COMMAND="info" ;;
dr) HOMEBREW_COMMAND="doctor" ;;
--repo) HOMEBREW_COMMAND="--repository" ;;
ls) HOMEBREW_COMMAND="list" ;;
homepage) HOMEBREW_COMMAND="home" ;;
-S) HOMEBREW_COMMAND="search" ;;
up) HOMEBREW_COMMAND="update" ;;
ln) HOMEBREW_COMMAND="link" ;;
instal) HOMEBREW_COMMAND="install" ;; # gem does the same
uninstal) HOMEBREW_COMMAND="uninstall" ;;
rm) HOMEBREW_COMMAND="uninstall" ;;
remove) HOMEBREW_COMMAND="uninstall" ;;
configure) HOMEBREW_COMMAND="diy" ;;
abv) HOMEBREW_COMMAND="info" ;;
dr) HOMEBREW_COMMAND="doctor" ;;
--repo) HOMEBREW_COMMAND="--repository" ;;
environment) HOMEBREW_COMMAND="--env" ;;
--config) HOMEBREW_COMMAND="config" ;;
-v) HOMEBREW_COMMAND="--version" ;;
--config) HOMEBREW_COMMAND="config" ;;
-v) HOMEBREW_COMMAND="--version" ;;
esac
# Set HOMEBREW_DEV_CMD_RUN for users who have run a development command.

View File

@ -11,8 +11,11 @@ homebrew-update-reset() {
for option in "$@"
do
case "${option}" in
-\? | -h | --help | --usage) brew help update-reset; exit $? ;;
--debug) HOMEBREW_DEBUG=1 ;;
-\? | -h | --help | --usage)
brew help update-reset
exit $?
;;
--debug) HOMEBREW_DEBUG=1 ;;
-*)
[[ "${option}" == *d* ]] && HOMEBREW_DEBUG=1
;;

View File

@ -222,8 +222,8 @@ merge_or_rebase() {
git rebase --abort &>/dev/null
git reset --mixed "${QUIET_ARGS[@]}"
if ! git -c "user.email=brew-update@localhost" \
-c "user.name=brew update" \
stash save --include-untracked "${QUIET_ARGS[@]}"
-c "user.name=brew update" \
stash save --include-untracked "${QUIET_ARGS[@]}"
then
odie <<EOS
Could not 'git stash' in ${DIR}!
@ -312,15 +312,18 @@ homebrew-update() {
for option in "$@"
do
case "${option}" in
-\? | -h | --help | --usage) brew help update; exit $? ;;
--verbose) HOMEBREW_VERBOSE=1 ;;
--debug) HOMEBREW_DEBUG=1 ;;
--quiet) HOMEBREW_QUIET=1 ;;
--merge) HOMEBREW_MERGE=1 ;;
--force) HOMEBREW_UPDATE_FORCE=1 ;;
-\? | -h | --help | --usage)
brew help update
exit $?
;;
--verbose) HOMEBREW_VERBOSE=1 ;;
--debug) HOMEBREW_DEBUG=1 ;;
--quiet) HOMEBREW_QUIET=1 ;;
--merge) HOMEBREW_MERGE=1 ;;
--force) HOMEBREW_UPDATE_FORCE=1 ;;
--simulate-from-current-branch) HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH=1 ;;
--preinstall) export HOMEBREW_UPDATE_PREINSTALL=1 ;;
--*) ;;
--preinstall) export HOMEBREW_UPDATE_PREINSTALL=1 ;;
--*) ;;
-*)
[[ "${option}" == *v* ]] && HOMEBREW_VERBOSE=1
[[ "${option}" == *q* ]] && HOMEBREW_QUIET=1

View File

@ -259,11 +259,14 @@ homebrew-vendor-install() {
for option in "$@"
do
case "${option}" in
-\?|-h|--help|--usage) brew help vendor-install; exit $? ;;
--verbose) HOMEBREW_VERBOSE=1 ;;
--quiet) HOMEBREW_QUIET=1 ;;
--debug) HOMEBREW_DEBUG=1 ;;
--*) ;;
-\? | -h | --help | --usage)
brew help vendor-install
exit $?
;;
--verbose) HOMEBREW_VERBOSE=1 ;;
--quiet) HOMEBREW_QUIET=1 ;;
--debug) HOMEBREW_DEBUG=1 ;;
--*) ;;
-*)
[[ "${option}" == *v* ]] && HOMEBREW_VERBOSE=1
[[ "${option}" == *q* ]] && HOMEBREW_QUIET=1

View File

@ -18,19 +18,19 @@ homebrew-items() {
# shellcheck disable=SC2154
items="$(
find "${HOMEBREW_REPOSITORY}/Library/Taps" \
-type d \( \
-name "${find_filter}" -o \
-name cmd -o \
-name .github -o \
-name lib -o \
-name spec -o \
-name vendor \
\) \
-prune -false -o -name '*\.rb' |
-type d \( \
-name "${find_filter}" -o \
-name cmd -o \
-name .github -o \
-name lib -o \
-name spec -o \
-name vendor \
\) \
-prune -false -o -name '*\.rb' |
sed "${sed_extended_regex_flag}" \
-e 's/\.rb//g' \
-e 's_.*/Taps/(.*)/(home|linux)brew-_\1/_' \
-e "${sed_filter}"
-e 's/\.rb//g' \
-e 's_.*/Taps/(.*)/(home|linux)brew-_\1/_' \
-e "${sed_filter}"
)"
local shortnames
shortnames="$(echo "${items}" | cut -d "/" -f 3)"

View File

@ -10,13 +10,15 @@ homebrew-prefix() {
case "$1" in
# check we actually have --prefix and not e.g. --prefixsomething
--prefix)
local prefix="1"; shift
local prefix="1"
shift
;;
# reject all other flags
-*) return 1 ;;
*)
[[ -n "${formula}" ]] && return 1
local formula="$1"; shift
local formula="$1"
shift
;;
esac
done

View File

@ -5,10 +5,10 @@
if [[ "${HOMEBREW_CCCFG}" = *a* ]]
then
case "$1" in
--cc) echo "cc" ;;
--cpp) echo "cpp" ;;
--includedir) echo "${HOMEBREW_SDKROOT}/usr/include/apr-1" ;;
--includes) echo "-isystem${HOMEBREW_SDKROOT}/usr/include/apr-1" ;;
--cc) echo "cc" ;;
--cpp) echo "cpp" ;;
--includedir) echo "${HOMEBREW_SDKROOT}/usr/include/apr-1" ;;
--includes) echo "-isystem${HOMEBREW_SDKROOT}/usr/include/apr-1" ;;
--apr-libtool) echo "glibtool" ;;
*)
exec xcrun apr-1-config "$@"