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

style: add keyward argument inplace to run_shfmt

Browse Source
This commit is contained in:
XuehaiPan 2021-09-15 22:31:56 +08:00
parent 1bb68bda3f
commit 03c7a142be
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/style.rb
View File

@ -65,7 +65,7 @@ module Homebrew
run_shellcheck(shell_files, output_type) run_shellcheck(shell_files, output_type)
end end
run_shfmt(shell_files) if ruby_files.none? || shell_files.any? run_shfmt(shell_files, inplace: fix) if ruby_files.none? || shell_files.any?
if output_type == :json if output_type == :json
Offenses.new(rubocop_result + shellcheck_result) Offenses.new(rubocop_result + shellcheck_result)
@ -214,11 +214,16 @@ module Homebrew
end end
end end
def run_shfmt(files) def run_shfmt(files, inplace: false)
files = shell_scripts if files.empty? files = shell_scripts if files.empty?
# Do not format completions and Dockerfile
files.delete(HOMEBREW_REPOSITORY/"completions/bash/brew")
files.delete(HOMEBREW_REPOSITORY/"Dockerfile")
args = ["-i", "2", "-ci", "-ln", "bash", "--", *files] args = ["-i", "2", "-ci", "-ln", "bash", "--", *files]
args.unshift("-w") if inplace
system shfmt, *args system shfmt, *args
$CHILD_STATUS.success? $CHILD_STATUS.success?
end end