From e4af65278369395a02be841276387042ff7b057d Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Tue, 20 Apr 2021 20:32:01 +0900 Subject: [PATCH] prefix.sh: repair style --- Library/Homebrew/prefix.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/prefix.sh b/Library/Homebrew/prefix.sh index 1bc902b6d9..11b0899dd9 100644 --- a/Library/Homebrew/prefix.sh +++ b/Library/Homebrew/prefix.sh @@ -2,7 +2,8 @@ # - `brew --prefix` (output HOMEBREW_PREFIX) # - `brew --prefix ` (output HOMEBREW_PREFIX/opt/) # anything else? delegate to the slower cmd/--prefix.rb - +# HOMEBREW_PREFIX and HOMEBREW_REPOSITORY are set by brew.sh +# shellcheck disable=SC2154 homebrew-prefix() { while [[ "$#" -gt 0 ]]; do case $1 in @@ -10,23 +11,23 @@ homebrew-prefix() { --prefix) local prefix="1"; shift ;; # reject all other flags -*) return 1 ;; - *) [ -n "$formula" ] && return 1; local formula="$1"; shift ;; + *) [ -n "${formula}" ] && return 1; local formula="$1"; shift ;; esac done - [ -z "$prefix" ] && return 1 - [ -z "$formula" ] && echo "$HOMEBREW_PREFIX" && return 0 + [ -z "${prefix}" ] && return 1 + [ -z "${formula}" ] && echo "${HOMEBREW_PREFIX}" && return 0 local formula_path - if [ -f "$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core/Formula/${formula}.rb" ]; then - formula_path="$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core/Formula/${formula}.rb" + if [ -f "${HOMEBREW_REPOSITORY}/Library/Taps/homebrew/homebrew-core/Formula/${formula}.rb" ]; then + formula_path="${HOMEBREW_REPOSITORY}/Library/Taps/homebrew/homebrew-core/Formula/${formula}.rb" else formula_path="$( shopt -s nullglob - echo "$HOMEBREW_REPOSITORY/Library/Taps"/*/*/{Formula/,HomebrewFormula/,}"${formula}.rb" + echo "${HOMEBREW_REPOSITORY}/Library/Taps"/*/*/{Formula/,HomebrewFormula/,}"${formula}.rb" )" fi - [ -z "$formula_path" ] && return 1 + [ -z "${formula_path}" ] && return 1 - echo "$HOMEBREW_PREFIX/opt/$formula" + echo "${HOMEBREW_PREFIX}/opt/${formula}" return 0 }