From 4235c035ff1abad0c22125c26cab813c42b29da0 Mon Sep 17 00:00:00 2001 From: Henrik Gombos Date: Sun, 11 Jun 2023 23:04:27 +0000 Subject: [PATCH] fix(Makefile): execute command -v instead of which --- Makefile | 6 +++--- test/TEST-62-SKIPCPIO/test.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1224c07eae..3ddc60990d 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,9 @@ ifeq ($(DRACUT_FULL_VERSION),) DRACUT_FULL_VERSION = $(DRACUT_VERSION) endif -HAVE_SHELLCHECK ?= $(shell which shellcheck >/dev/null 2>&1 && echo yes) -HAVE_SHFMT ?= $(shell which shfmt >/dev/null 2>&1 && echo yes) -HAVE_RPMBUILD ?= $(shell which rpmbuild >/dev/null 2>&1 && echo yes) +HAVE_SHELLCHECK ?= $(shell command -v shellcheck >/dev/null 2>&1 && echo yes) +HAVE_SHFMT ?= $(shell command -v shfmt >/dev/null 2>&1 && echo yes) +HAVE_RPMBUILD ?= $(shell command -v rpmbuild >/dev/null 2>&1 && echo yes) -include Makefile.inc diff --git a/test/TEST-62-SKIPCPIO/test.sh b/test/TEST-62-SKIPCPIO/test.sh index e263a6750a..fa6183286b 100755 --- a/test/TEST-62-SKIPCPIO/test.sh +++ b/test/TEST-62-SKIPCPIO/test.sh @@ -6,7 +6,7 @@ TEST_DESCRIPTION="test skipcpio" test_check() { - which cpio dd truncate find sort diff &> /dev/null + cpio dd truncate find sort diff &> /dev/null } skipcpio_simple() {