[committed] contrib: Quote variable in test expression [PR111360]

Jonathan Wakely jwakely@redhat.com
Tue Sep 12 11:45:21 GMT 2023


Committed as obvious.

-- >8 --

Without the quotes some shells will always return true and some will
print an error. It should be quoted so that a null variable works as
intended.

contrib/ChangeLog:

	PR other/111360
	* gcc_update: Quote variable.
---
 contrib/gcc_update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/gcc_update b/contrib/gcc_update
index 1d7bfab4935..cda2bdb0df9 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -343,7 +343,7 @@ case $vcs_type in
 	revision=`$GCC_GIT log -n1 --pretty=tformat:%h`
 	r=`$GCC_GIT describe --all --match 'basepoints/gcc-[0-9]*' HEAD \
 	   | sed -n 's,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)-\([0-9]\+\)-g[0-9a-f]*$,r\2-\3,p;s,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)$,r\2-0,p'`;
-	if test -n $r; then
+	if test -n "$r"; then
 		o=`$GCC_GIT config --get gcc-config.upstream`;
 		rr=`echo $r | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p'`;
 		if $GCC_GIT rev-parse --verify --quiet ${o:-origin}/releases/gcc-$rr >/dev/null; then
-- 
2.41.0



More information about the Libstdc++ mailing list