From 43377a3e5e5163a21d19263d77a656cd08540a73 Mon Sep 17 00:00:00 2001 From: XuehaiPan Date: Thu, 16 Sep 2021 01:08:02 +0800 Subject: [PATCH] style: fix inconsistent code style for shell scripts by runing `brew style --fix` --- Library/Homebrew/brew.sh | 75 +++++++++++++------ Library/Homebrew/cmd/update-reset.sh | 7 +- Library/Homebrew/cmd/update.sh | 23 +++--- Library/Homebrew/cmd/vendor-install.sh | 13 ++-- Library/Homebrew/items.sh | 24 +++--- Library/Homebrew/prefix.sh | 6 +- Library/Homebrew/shims/mac/super/apr-1-config | 8 +- 7 files changed, 97 insertions(+), 59 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 612c4a891d..291aadd20c 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -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. diff --git a/Library/Homebrew/cmd/update-reset.sh b/Library/Homebrew/cmd/update-reset.sh index fb7a99c193..c4eb2e1841 100644 --- a/Library/Homebrew/cmd/update-reset.sh +++ b/Library/Homebrew/cmd/update-reset.sh @@ -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 ;; diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index c754b36342..8d496d1220 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -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 <