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

Merge pull request #12129 from XuehaiPan/style-deps-diffutils

Browse Source 
utils/shfmt.sh: enable coloring only when brewed `diffutils` is installed
This commit is contained in:
Mike McQuaid 2021-09-28 08:36:08 +01:00 committed by GitHub
commit 33767b3503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/utils/shfmt.sh
View File

@ -19,16 +19,28 @@ fi
# HOMEBREW_PREFIX is set by extend/ENV/super.rb # HOMEBREW_PREFIX is set by extend/ENV/super.rb
# shellcheck disable=SC2154 # shellcheck disable=SC2154
SHFMT="${HOMEBREW_PREFIX}/opt/shfmt/bin/shfmt" SHFMT="${HOMEBREW_PREFIX}/opt/shfmt/bin/shfmt"
if [[ ! -x "${SHFMT}" ]] if [[ ! -x "${SHFMT}" ]]
then then
odie "${0##*/}: Please install shfmt by running \`brew install shfmt\`." odie "${0##*/}: Please install shfmt by running \`brew install shfmt\`."
fi fi
if [[ ! -x "$(command -v diff)" ]] # HOMEBREW_PREFIX is set by extend/ENV/super.rb
# shellcheck disable=SC2154
DIFF="${HOMEBREW_PREFIX}/opt/diffutils/bin/diff"
DIFF_ARGS=("-d" "-C" "1")
if [[ ! -x "${DIFF}" ]]
then then
# HOMEBREW_PATH is set by global.rb
# shellcheck disable=SC2154
if [[ -x "$(PATH="${HOMEBREW_PATH}" command -v diff)" ]]
then
DIFF="$(PATH="${HOMEBREW_PATH}" command -v diff)" # fall back to `diff` in PATH without coloring
else
odie "${0##*/}: Please install diff by running \`brew install diffutils\`." odie "${0##*/}: Please install diff by running \`brew install diffutils\`."
fi fi
else
DIFF_ARGS+=("--color") # enable color output for GNU diff
fi
SHFMT_ARGS=() SHFMT_ARGS=()
INPLACE='' INPLACE=''
@ -346,10 +358,10 @@ format() {
wrap_then_do "${file}" "${tempfile}" wrap_then_do "${file}" "${tempfile}"
align_multiline_switch_cases "${file}" "${tempfile}" align_multiline_switch_cases "${file}" "${tempfile}"
if ! diff -q "${file}" "${tempfile}" &>/dev/null if ! "${DIFF}" -q "${file}" "${tempfile}" &>/dev/null
then then
# Show differences # Show differences
diff -d -C 1 --color=auto "${file}" "${tempfile}" "${DIFF}" "${DIFF_ARGS[@]}" "${file}" "${tempfile}"
if [[ -n "${INPLACE}" ]] if [[ -n "${INPLACE}" ]]
then then
cp -af "${tempfile}" "${file}" cp -af "${tempfile}" "${file}"