summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraisinten <raisinten@gmail.com>2020-11-14 20:50:03 +0530
committerBeth Griggs <bgriggs@redhat.com>2020-12-15 20:15:24 +0000
commit699bb348d95c0b4078e542dee6efe9d54748c445 (patch)
tree5f7dc9aca9714614e04267cdebcd8290641ec533
parentd27e56356bb62bacf74965e441030faeeec2b24c (diff)
downloadnode-new-699bb348d95c0b4078e542dee6efe9d54748c445.tar.gz
build: replace which with command -v
PR-URL: https://github.com/nodejs/node/pull/36118 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
-rw-r--r--.github/workflows/linters.yml8
-rw-r--r--.github/workflows/misc.yml2
-rw-r--r--BSDmakefile2
-rw-r--r--Makefile8
-rwxr-xr-xandroid-configure4
5 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 6c25e775d3..14aed9bfdd 100644
--- 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
index 4ee135c5eb..1444dff726 100644
--- 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
index b2f36fa287..3994ab9efd 100644
--- 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
index 1d66978ff2..93d63110ae 100644
--- 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; \
@@ -915,7 +915,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)
@@ -1400,7 +1400,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
index a7cb2b9c8b..e3f4a72182 100755
--- 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}')