From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 12 Sep 2023 11:02:13 +0000 (+0100)
Subject: contrib: Quote variable in test expression [PR111360]
X-Git-Tag: basepoints/gcc-15~6260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df63338236b91ba79d5f89fce9b16e0c34b2bada;p=thirdparty%2Fgcc.git

contrib: Quote variable in test expression [PR111360]

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.
---

diff --git a/contrib/gcc_update b/contrib/gcc_update
index 1d7bfab4935b..cda2bdb0df91 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