From 65df4efd1af7a8c0b939d2c42b10f01791f4f632 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Thu, 31 Dec 2020 16:24:53 -0500 Subject: [PATCH 1/3] workflows/tests: install shellcheck before checking style --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b00695e500..fd3f90b498 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,9 @@ jobs: - name: Install Bundler RubyGems run: brew install-bundler-gems + - name: Install shellcheck + run: brew install shellcheck + - run: brew style --display-cop-names - run: brew man --fail-if-changed From bcac46bccb1dc965f097bb12c76513e9ab993939 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Fri, 1 Jan 2021 03:26:08 -0500 Subject: [PATCH 2/3] style: use Homebrew shellcheck if installed --- Library/Homebrew/style.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/style.rb b/Library/Homebrew/style.rb index 8f52ac7af3..916d3bc64f 100644 --- a/Library/Homebrew/style.rb +++ b/Library/Homebrew/style.rb @@ -162,12 +162,13 @@ module Homebrew end def run_shellcheck(files, output_type) - shellcheck = which("shellcheck") + shellcheck = Formula["shellcheck"].opt_bin/"shellcheck" if Formula["shellcheck"].any_version_installed? + shellcheck ||= which("shellcheck") shellcheck ||= which("shellcheck", ENV["HOMEBREW_PATH"]) shellcheck ||= begin ohai "Installing `shellcheck` for shell style checks..." safe_system HOMEBREW_BREW_FILE, "install", "shellcheck" - which("shellcheck") || which("shellcheck", ENV["HOMEBREW_PATH"]) + Formula["shellcheck"].opt_bin/"shellcheck" end if files.empty? From 45255d3b3ca0edc423f49550c2a6bce9909fffe1 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Fri, 1 Jan 2021 03:26:18 -0500 Subject: [PATCH 3/3] manpage: update date --- manpages/brew.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manpages/brew.1 b/manpages/brew.1 index 6831554b21..d4a0d8010c 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW" "1" "December 2020" "Homebrew" "brew" +.TH "BREW" "1" "January 2021" "Homebrew" "brew" . .SH "NAME" \fBbrew\fR \- The Missing Package Manager for macOS (or Linux)