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 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?