build: replace which with command -v

PR-URL: #36118 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Nov 22, 2020 · fcc38a1 · fcc38a1
1 parent 1a4d43f
commit fcc38a1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Lint addon docs
-        run: NODE=$(which node) make lint-addon-docs
+        run: NODE=$(command -v node) make lint-addon-docs
   lint-cpp:
     runs-on: ubuntu-latest
     steps:
@@ -50,7 +50,7 @@ jobs:
       - name: Lint docs
         run: |
           echo "::add-matcher::.github/workflows/remark-lint-problem-matcher.json"
-          NODE=$(which node) make lint-md
+          NODE=$(command -v node) make lint-md
   lint-js:
     runs-on: ubuntu-latest
     steps:
@@ -62,7 +62,7 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Lint JavaScript files
-        run: NODE=$(which node) make lint-js
+        run: NODE=$(command -v node) make lint-js
   lint-py:
     runs-on: ubuntu-latest
     steps:
@@ -76,7 +76,7 @@ jobs:
       - name: Lint Python
         run: |
           make lint-py-build || true
-          NODE=$(which node) make lint-py
+          NODE=$(command -v node) make lint-py
 
   lint-codeowners:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Build
-        run: NODE=$(which node) make doc-only
+        run: NODE=$(command -v node) make doc-only
       - uses: actions/upload-artifact@v1
         with:
           name: docs

diff --git a/BSDmakefile b/BSDmakefile
@@ -3,7 +3,7 @@ FLAGS=${.MAKEFLAGS:C/\-J ([0-9]+,?)+//W}
 
 all: .DEFAULT
 .DEFAULT:
-	@which gmake > /dev/null 2>&1 ||\
+	@command -v gmake > /dev/null 2>&1 ||\
 		(echo "GMake is required for node.js to build.\
 			Install and try again" && exit 1)
 	@gmake ${.FLAGS} ${.TARGETS}

diff --git a/Makefile b/Makefile
@@ -65,8 +65,8 @@ V ?= 0
 available-node = \
 	if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
 		$(PWD)/$(NODE) $(1); \
-	elif [ -x `which node` ] && [ -e `which node` ] && [ `which node` ]; then \
-		`which node` $(1); \
+	elif [ -x `command -v node` ] && [ -e `command -v node` ] && [ `command -v node` ]; then \
+		`command -v node` $(1); \
 	else \
 		echo "No available node, cannot run \"node $(1)\""; \
 		exit 1; \
@@ -898,7 +898,7 @@ BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
 endif
 BINARYTAR=$(BINARYNAME).tar
 # OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/
-HAS_XZ ?= $(shell which xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
+HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
 # Supply SKIP_XZ=1 to explicitly skip .tar.xz creation
 SKIP_XZ ?= 0
 XZ = $(shell [ $(HAS_XZ) -eq 1 -a $(SKIP_XZ) -eq 0 ] && echo 1 || echo 0)
@@ -1383,7 +1383,7 @@ lint-clean:
 	$(RM) tools/.*lintstamp
 	$(RM) .eslintcache
 
-HAS_DOCKER ?= $(shell which docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
+HAS_DOCKER ?= $(shell command -v docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
 
 ifeq ($(HAS_DOCKER), 1)
 DOCKER_COMMAND ?= docker run -it -v $(PWD):/node

diff --git a/android-configure b/android-configure
@@ -50,8 +50,8 @@ esac
 
 HOST_OS="linux"
 HOST_ARCH="x86_64"
-export CC_host=$(which gcc)
-export CXX_host=$(which g++)
+export CC_host=$(command -v gcc)
+export CXX_host=$(command -v g++)
 
 host_gcc_version=$($CC_host --version | grep gcc | awk '{print $NF}')
 major=$(echo $host_gcc_version | awk -F . '{print $1}')