From 21d015a2c21225bcdeb9b5fb4338e9a1fe12f6b7 Mon Sep 17 00:00:00 2001
From: Bartol Deak <b@bdeak.net>
Date: Tue, 13 Jun 2023 11:57:52 +0200
Subject: [PATCH] rewrite `which` with `command -v`

Signed-off-by: Bartol Deak <b@bdeak.net>
---
 Makefile        | 2 +-
 Makefile.common | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2816c9801..0dd8673af 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ assets-tarball: assets
 .PHONY: parser
 parser:
 	@echo ">> running goyacc to generate the .go file."
-ifeq (, $(shell which goyacc 2>/dev/null))
+ifeq (, $(shell command -v goyacc > /dev/null))
 	@echo "goyacc not installed so skipping"
 	@echo "To install: go install golang.org/x/tools/cmd/goyacc@v0.6.0"
 else
diff --git a/Makefile.common b/Makefile.common
index bb8e396c0..0c97bbf57 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -49,7 +49,7 @@ endif
 GOTEST := $(GO) test
 GOTEST_DIR :=
 ifneq ($(CIRCLE_JOB),)
-ifneq ($(shell which gotestsum),)
+ifneq ($(shell command -v gotestsum > /dev/null),)
 	GOTEST_DIR := test-results
 	GOTEST := gotestsum --junitfile $(GOTEST_DIR)/unit-tests.xml --
 endif
@@ -180,7 +180,7 @@ endif
 .PHONY: common-yamllint
 common-yamllint:
 	@echo ">> running yamllint on all YAML files in the repository"
-ifeq (, $(shell which yamllint 2>/dev/null))
+ifeq (, $(shell command -v yamllint > /dev/null))
 	@echo "yamllint not installed so skipping"
 else
 	yamllint .