From b5b1d1fb79f1c644be57efd7b7efcfbb13938d31 Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Tue, 18 May 2021 23:15:53 -0400 Subject: [PATCH] build: replace non-POSIX test -a|o test/[ from sbase unix tools[1] throws "too many arguments" if -a or -o is provided. The syntax has been marked obsolescent as per the manual[2]. [1] http://core.suckless.org/sbase/ [2] https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16 PR-URL: https://github.com/nodejs/node/pull/38731 Reviewed-By: Luigi Pinca Reviewed-By: Richard Lau Reviewed-By: Minwoo Jung Reviewed-By: Darshan Sen Reviewed-By: James M Snell Reviewed-By: Benjamin Gruenbaum --- Makefile | 12 ++++++------ android-configure | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index dfea6ee2d3e3cf..de6dae1d2729da 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ $(NODE_EXE): build_type:=Release $(NODE_G_EXE): build_type:=Debug $(NODE_EXE) $(NODE_G_EXE): config.gypi out/Makefile $(MAKE) -C out BUILDTYPE=${build_type} V=$(V) - if [ ! -r $@ -o ! -L $@ ]; then \ + if [ ! -r $@ ] || [ ! -L $@ ]; then \ ln -fs out/${build_type}/$(NODE_EXE) $@; fi else ifeq ($(BUILD_WITH), ninja) @@ -116,11 +116,11 @@ else endif $(NODE_EXE): config.gypi out/Release/build.ninja ninja -C out/Release $(NINJA_ARGS) - if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi + if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi $(NODE_G_EXE): config.gypi out/Debug/build.ninja ninja -C out/Debug $(NINJA_ARGS) - if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi + if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi else $(NODE_EXE) $(NODE_G_EXE): $(warning This Makefile currently only supports building with 'make' or 'ninja') @@ -906,7 +906,7 @@ BINARYTAR=$(BINARYNAME).tar 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) +XZ = $(shell [ $(HAS_XZ) -eq 1 ] && [ $(SKIP_XZ) -eq 0 ] && echo 1 || echo 0) XZ_COMPRESSION ?= 9e PKG=$(TARNAME).pkg MACOSOUTDIR=out/macos @@ -947,7 +947,7 @@ release-only: check-xz echo "" >&2 ; \ exit 1 ; \ fi - @if [ "$(DISTTYPE)" != "release" -o "$(RELEASE)" = "1" ]; then \ + @if [ "$(DISTTYPE)" != "release" ] || [ "$(RELEASE)" = "1" ]; then \ exit 0; \ else \ echo "" >&2 ; \ @@ -956,7 +956,7 @@ release-only: check-xz echo "" >&2 ; \ exit 1 ; \ fi - @if [ "$(RELEASE)" = "0" -o -f "$(CHANGELOG)" ]; then \ + @if [ "$(RELEASE)" = "0" ] || [ -f "$(CHANGELOG)" ]; then \ exit 0; \ else \ echo "" >&2 ; \ diff --git a/android-configure b/android-configure index ecb13f399e4d5d..43341d1abea765 100755 --- a/android-configure +++ b/android-configure @@ -56,7 +56,7 @@ 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}') minor=$(echo $host_gcc_version | awk -F . '{print $2}') -if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || [ $major -eq 6 -a $minor -lt 3 ]; then +if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || ( [ $major -eq 6 ] && [ $minor -lt 3 ] ); then echo "host gcc $host_gcc_version is too old, need gcc 6.3.0" return 1 fi