File tree Expand file tree Collapse file tree 5 files changed +12
-12
lines changed Expand file tree Collapse file tree 5 files changed +12
-12
lines changed Original file line number Diff line number Diff line change 2424 - name : Environment Information
2525 run : npx envinfo
2626 - name : Lint addon docs
27- run : NODE=$(which node) make lint-addon-docs
27+ run : NODE=$(command -v node) make lint-addon-docs
2828 lint-cpp :
2929 runs-on : ubuntu-latest
3030 steps :
5050 - name : Lint docs
5151 run : |
5252 echo "::add-matcher::.github/workflows/remark-lint-problem-matcher.json"
53- NODE=$(which node) make lint-md
53+ NODE=$(command -v node) make lint-md
5454 lint-js :
5555 runs-on : ubuntu-latest
5656 steps :
6262 - name : Environment Information
6363 run : npx envinfo
6464 - name : Lint JavaScript files
65- run : NODE=$(which node) make lint-js
65+ run : NODE=$(command -v node) make lint-js
6666 lint-py :
6767 runs-on : ubuntu-latest
6868 steps :
7676 - name : Lint Python
7777 run : |
7878 make lint-py-build || true
79- NODE=$(which node) make lint-py
79+ NODE=$(command -v node) make lint-py
8080
8181 lint-codeowners :
8282 runs-on : ubuntu-latest
Original file line number Diff line number Diff line change 2323 - name : Environment Information
2424 run : npx envinfo
2525 - name : Build
26- run : NODE=$(which node) make doc-only
26+ run : NODE=$(command -v node) make doc-only
2727 - uses : actions/upload-artifact@v1
2828 with :
2929 name : docs
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ FLAGS=${.MAKEFLAGS:C/\-J ([0-9]+,?)+//W}
33
44all : .DEFAULT
55.DEFAULT :
6- @which gmake > /dev/null 2>&1 || \
6+ @command -v gmake > /dev/null 2>&1 || \
77 (echo " GMake is required for node.js to build.\
88 Install and try again" && exit 1)
99 @gmake ${.FLAGS} ${.TARGETS}
Original file line number Diff line number Diff line change 6565available-node = \
6666 if [ -x $(PWD ) /$(NODE ) ] && [ -e $(PWD ) /$(NODE ) ]; then \
6767 $(PWD ) /$(NODE ) $(1 ) ; \
68- elif [ -x ` which node` ] && [ -e ` which node` ] && [ ` which node` ]; then \
69- ` which node` $(1 ) ; \
68+ elif [ -x ` command -v node` ] && [ -e ` command -v node` ] && [ ` command -v node` ]; then \
69+ ` command -v node` $(1 ) ; \
7070 else \
7171 echo "No available node, cannot run \"node $(1 ) \""; \
7272 exit 1; \
@@ -899,7 +899,7 @@ BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
899899endif
900900BINARYTAR =$(BINARYNAME ) .tar
901901# OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/
902- HAS_XZ ?= $(shell which xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
902+ HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
903903# Supply SKIP_XZ=1 to explicitly skip .tar.xz creation
904904SKIP_XZ ?= 0
905905XZ = $(shell [ $(HAS_XZ ) -eq 1 -a $(SKIP_XZ ) -eq 0 ] && echo 1 || echo 0)
@@ -1384,7 +1384,7 @@ lint-clean:
13841384 $(RM ) tools/.* lintstamp
13851385 $(RM ) .eslintcache
13861386
1387- HAS_DOCKER ?= $(shell which docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
1387+ HAS_DOCKER ?= $(shell command -v docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
13881388
13891389ifeq ($(HAS_DOCKER ) , 1)
13901390DOCKER_COMMAND ?= docker run -it -v $(PWD ) :/node
Original file line number Diff line number Diff line change 5050
5151HOST_OS=" linux"
5252HOST_ARCH=" x86_64"
53- export CC_host=$( which gcc)
54- export CXX_host=$( which g++)
53+ export CC_host=$( command -v gcc)
54+ export CXX_host=$( command -v g++)
5555
5656host_gcc_version=$( $CC_host --version | grep gcc | awk ' {print $NF}' )
5757major=$( echo $host_gcc_version | awk -F . ' {print $1}' )
You can’t perform that action at this time.
0 commit comments