Scripts/generate-derived-sources.sh: line 19: [: binary operator expected while building Source/WebKit

https://bugs.webkit.org/show_bug.cgi?id=228908

Patch by Kimmo Kinnunen <[email protected]> on 2021-08-10
Reviewed by Per Arne Vollan.

Source/JavaScriptCore:

* Scripts/generate-derived-sources.sh:
Quote the use of CC so that future copy-paste does not make the same mistake
as this bug.

Source/WebCore:

* Scripts/generate-derived-sources.sh:
Quote the use of CC so that future copy-paste does not make the same mistake
as this bug.

Source/WebKit:

Change variable references in the sh script to quoted "$VAR".
[ -z $VAR ] with VAR="a b" would mean
[ -z a b ].
 -z is unary operator, so the expression b would be in position
where test would expect an operator.
The correct form is [ -z "a b" ].

In general, sh scripts usually refer to variables using quotes.

* Scripts/generate-derived-sources.sh:
Fix a bug where multiple space separated paths in
WEBKITADDITIONS_HEADER_SEARCH_PATHS would cause
test expression to receive arguments after the -z arg.

Quote the use of CC so future copy-paste does not make the same mistake
as this bug.

Tools:

* DumpRenderTree/Scripts/generate-derived-sources.sh:
* WebKitTestRunner/Scripts/generate-derived-sources.sh:
Quote the use of CC so that future copy-paste does not make the same mistake
as this bug.

Canonical link: https://commits.webkit.org/240397@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: kkinnunen-apple

Source/JavaScriptCore/ChangeLog

@@ -1,3 +1,14 @@
+2021-08-10  Kimmo Kinnunen  <[email protected]>
+
+        Scripts/generate-derived-sources.sh: line 19: [: binary operator expected while building Source/WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=228908
+
+        Reviewed by Per Arne Vollan.
+
+        * Scripts/generate-derived-sources.sh:
+        Quote the use of CC so that future copy-paste does not make the same mistake
+        as this bug.
+
 2021-08-09  Yusuke Suzuki  <[email protected]>
 
         [JSC] super-Latin1 white space and line terminator after regular expression literal misinterpreted as flags

Source/JavaScriptCore/Scripts/generate-derived-sources.sh

@@ -11,7 +11,7 @@ cd "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore"
 export JavaScriptCore="JavaScriptCore"
 export BUILT_PRODUCTS_DIR="../.."
 
-if [ ! $CC ]; then
+if [ ! "$CC" ]; then
     export CC="`xcrun -find clang`"
 fi
 

Source/WebCore/ChangeLog

@@ -1,3 +1,15 @@
+2021-08-10  Kimmo Kinnunen  <[email protected]>
+
+        Scripts/generate-derived-sources.sh: line 19: [: binary operator expected while building Source/WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=228908
+
+        Reviewed by Per Arne Vollan.
+
+
+        * Scripts/generate-derived-sources.sh:
+        Quote the use of CC so that future copy-paste does not make the same mistake
+        as this bug.
+
 2021-08-10  Devin Rousso  <[email protected]>
 
         [macOS] REGRESSION(r278850): modifying `playbackRate` via JS on a TouchBar mac only sometimes works and also causes the `defaultPlaybackRate` to change

Source/WebCore/Scripts/generate-derived-sources.sh

@@ -12,11 +12,11 @@ export WebCore="WebCore"
 /bin/ln -sfh "${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}" JavaScriptCorePrivateHeaders
 export JavaScriptCore_SCRIPTS_DIR="JavaScriptCorePrivateHeaders"
 
-if [ ! $CC ]; then
+if [ ! "$CC" ]; then
     export CC="`xcrun -find clang`"
 fi
 
-if [ ! $GPERF ]; then
+if [ ! "$GPERF" ]; then
     export GPERF="`xcrun -find gperf`"
 fi
 

Source/WebKit/ChangeLog

@@ -1,3 +1,27 @@
+2021-08-10  Kimmo Kinnunen  <[email protected]>
+
+        Scripts/generate-derived-sources.sh: line 19: [: binary operator expected while building Source/WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=228908
+
+        Reviewed by Per Arne Vollan.
+
+        Change variable references in the sh script to quoted "$VAR".
+        [ -z $VAR ] with VAR="a b" would mean
+        [ -z a b ].
+         -z is unary operator, so the expression b would be in position
+        where test would expect an operator.
+        The correct form is [ -z "a b" ].
+
+        In general, sh scripts usually refer to variables using quotes.
+
+        * Scripts/generate-derived-sources.sh:
+        Fix a bug where multiple space separated paths in
+        WEBKITADDITIONS_HEADER_SEARCH_PATHS would cause
+        test expression to receive arguments after the -z arg.
+
+        Quote the use of CC so future copy-paste does not make the same mistake
+        as this bug.
+
 2021-08-10  Peng Liu  <[email protected]>
 
         RemoteImageDecoderAVF::clearFrameBufferCache() uses a weak pointer without checking its validity

Source/WebKit/Scripts/generate-derived-sources.sh

@@ -12,11 +12,11 @@ export WebKit2="${SRCROOT}"
 /bin/ln -sfh "${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}" JavaScriptCorePrivateHeaders
 export JavaScriptCore_SCRIPTS_DIR="JavaScriptCorePrivateHeaders"
 
-if [ ! $CC ]; then
+if [ ! "$CC" ]; then
     export CC="`xcrun -find clang`"
 fi
 
-if [ ! -z ${WEBKITADDITIONS_HEADER_SEARCH_PATHS} ]; then
+if [ ! -z "${WEBKITADDITIONS_HEADER_SEARCH_PATHS}" ]; then
     MAKEFILE_INCLUDE_FLAGS=$(echo "${WEBKITADDITIONS_HEADER_SEARCH_PATHS}" | perl -e 'print "-I" . join(" -I", split(" ", <>));')
 fi
 

Tools/ChangeLog

@@ -1,3 +1,15 @@
+2021-08-10  Kimmo Kinnunen  <[email protected]>
+
+        Scripts/generate-derived-sources.sh: line 19: [: binary operator expected while building Source/WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=228908
+
+        Reviewed by Per Arne Vollan.
+
+        * DumpRenderTree/Scripts/generate-derived-sources.sh:
+        * WebKitTestRunner/Scripts/generate-derived-sources.sh:
+        Quote the use of CC so that future copy-paste does not make the same mistake
+        as this bug.
+
 2021-08-10  Devin Rousso  <[email protected]>
 
         [macOS] REGRESSION(r278850): modifying `playbackRate` via JS on a TouchBar mac only sometimes works and also causes the `defaultPlaybackRate` to change

Tools/DumpRenderTree/Scripts/generate-derived-sources.sh

@@ -10,7 +10,7 @@ cd "${BUILT_PRODUCTS_DIR}/DerivedSources/DumpRenderTree"
 export DumpRenderTree="${SRCROOT}"
 export WebCoreScripts="${WEBCORE_PRIVATE_HEADERS_DIR}"
 
-if [ ! $CC ]; then
+if [ ! "$CC" ]; then
     export CC="`xcrun -find clang`"
 fi
 

Tools/WebKitTestRunner/Scripts/generate-derived-sources.sh

@@ -10,7 +10,7 @@ cd "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner"
 export WebKitTestRunner="${SRCROOT}"
 export WebCoreScripts="${WEBCORE_PRIVATE_HEADERS_DIR}"
 
-if [ ! $CC ]; then
+if [ ! "$CC" ]; then
     export CC="`xcrun -find clang`"
 fi