From d9013511623423145c1844ed10d4938df3ec757d Mon Sep 17 00:00:00 2001 From: Sven Rebhan <36194019+srebhan@users.noreply.github.com> Date: Thu, 2 Dec 2021 15:07:18 +0100 Subject: [PATCH] fix: Revert unintented corruption of the Makefile from #10200. (#10203) (cherry picked from commit 52c422af3b32ab4185f82ce3f7789255934ab4b8) --- Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 0e4b21bcb4b3d..2d19dd19fc4c1 100644 --- a/Makefile +++ b/Makefile @@ -150,18 +150,17 @@ lint-install: .PHONY: lint lint: - ifeq (, $(shell which golangci-lint)) - $(info golangci-lint can't be found, please run: make lint-install) - exit 1 - endif - - golangci-lint run - - ifeq (, $(shell which markdownlint-cli)) - $(info markdownlint-cli can't be found, please run: make lint-install) - exit 1 - endif - markdownlint-cli + @which golangci-lint >/dev/null 2>&1 || { \ + echo "golangci-lint not found, please run: make lint-install"; \ + exit 1; \ + } + golangci-lint run + + @which markdownlint >/dev/null 2>&1 || { \ + echo "markdownlint not found, please run: make lint-install"; \ + exit 1; \ + } + markdownlint . .PHONY: lint-branch lint-branch: