Commit e9be209
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: #38731
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>1 parent 695e982 commit e9be209
2 files changed
Lines changed: 7 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -103,7 +103,7 @@ $(NODE_EXE): build_type:=Release | |||
| 103 | 103 | $(NODE_G_EXE): build_type:=Debug | |
| 104 | 104 | $(NODE_EXE) $(NODE_G_EXE): config.gypi out/Makefile | |
| 105 | 105 | $(MAKE) -C out BUILDTYPE=${build_type} V=$(V) | |
| 106 | - if [ ! -r $@ -o ! -L $@ ]; then \ | ||
| 106 | + if [ ! -r $@ ] || [ ! -L $@ ]; then \ | ||
| 107 | 107 | ln -fs out/${build_type}/$(NODE_EXE) $@; fi | |
| 108 | 108 | else | |
| 109 | 109 | ifeq ($(BUILD_WITH), ninja) | |
@@ -117,11 +117,11 @@ else | |||
| 117 | 117 | endif | |
| 118 | 118 | $(NODE_EXE): config.gypi out/Release/build.ninja | |
| 119 | 119 | ninja -C out/Release $(NINJA_ARGS) | |
| 120 | - if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi | ||
| 120 | + if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi | ||
| 121 | 121 | ||
| 122 | 122 | $(NODE_G_EXE): config.gypi out/Debug/build.ninja | |
| 123 | 123 | ninja -C out/Debug $(NINJA_ARGS) | |
| 124 | - if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi | ||
| 124 | + if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi | ||
| 125 | 125 | else | |
| 126 | 126 | $(NODE_EXE) $(NODE_G_EXE): | |
| 127 | 127 | $(warning This Makefile currently only supports building with 'make' or 'ninja') | |
@@ -908,7 +908,7 @@ BINARYTAR=$(BINARYNAME).tar | |||
| 908 | 908 | HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0) | |
| 909 | 909 | # Supply SKIP_XZ=1 to explicitly skip .tar.xz creation | |
| 910 | 910 | SKIP_XZ ?= 0 | |
| 911 | - XZ = $(shell [ $(HAS_XZ) -eq 1 -a $(SKIP_XZ) -eq 0 ] && echo 1 || echo 0) | ||
| 911 | + XZ = $(shell [ $(HAS_XZ) -eq 1 ] && [ $(SKIP_XZ) -eq 0 ] && echo 1 || echo 0) | ||
| 912 | 912 | XZ_COMPRESSION ?= 9e | |
| 913 | 913 | PKG=$(TARNAME).pkg | |
| 914 | 914 | MACOSOUTDIR=out/macos | |
@@ -949,7 +949,7 @@ release-only: check-xz | |||
| 949 | 949 | echo "" >&2 ; \ | |
| 950 | 950 | exit 1 ; \ | |
| 951 | 951 | fi | |
| 952 | - @if [ "$(DISTTYPE)" != "release" -o "$(RELEASE)" = "1" ]; then \ | ||
| 952 | + @if [ "$(DISTTYPE)" != "release" ] || [ "$(RELEASE)" = "1" ]; then \ | ||
| 953 | 953 | exit 0; \ | |
| 954 | 954 | else \ | |
| 955 | 955 | echo "" >&2 ; \ | |
@@ -958,7 +958,7 @@ release-only: check-xz | |||
| 958 | 958 | echo "" >&2 ; \ | |
| 959 | 959 | exit 1 ; \ | |
| 960 | 960 | fi | |
| 961 | - @if [ "$(RELEASE)" = "0" -o -f "$(CHANGELOG)" ]; then \ | ||
| 961 | + @if [ "$(RELEASE)" = "0" ] || [ -f "$(CHANGELOG)" ]; then \ | ||
| 962 | 962 | exit 0; \ | |
| 963 | 963 | else \ | |
| 964 | 964 | echo "" >&2 ; \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -56,7 +56,7 @@ export CXX_host=$(command -v g++) | |||
| 56 | 56 | host_gcc_version=$($CC_host --version | grep gcc | awk '{print $NF}') | |
| 57 | 57 | major=$(echo $host_gcc_version | awk -F . '{print $1}') | |
| 58 | 58 | minor=$(echo $host_gcc_version | awk -F . '{print $2}') | |
| 59 | - if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || [ $major -eq 6 -a $minor -lt 3 ]; then | ||
| 59 | + if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || ( [ $major -eq 6 ] && [ $minor -lt 3 ] ); then | ||
| 60 | 60 | echo "host gcc $host_gcc_version is too old, need gcc 6.3.0" | |
| 61 | 61 | return 1 | |
| 62 | 62 | fi | |
0 commit comments