From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 8 Nov 2018 15:05:21 +0000 (+0000)
Subject: bin/get-pick-list.sh: use test instead of [ ]
X-Git-Tag: android-x86-8.1-r1~93
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=221a8e3366dcaef54c4773fbbbc9e2caa786d5b9;p=android-x86%2Fexternal-mesa.git

bin/get-pick-list.sh: use test instead of [ ]

Latter is rather picky wrt surrounding white space. The explicit `test`
doesn't have that problem, plus the statements read a bit easier.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit c0012a07088e86f6d30405d0522a0d72801e2ec7)
---

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index a540cedfbd0..e7fffdd1280 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -30,10 +30,10 @@ is_sha_nomination()
 		grep -Eo 'fixes:[a-f0-9]{8,40}'`
 
 	fixes_count=`echo "$fixes" | wc -l`
-	if [ $fixes_count -eq 0 ] ; then
+	if test $fixes_count -eq 0; then
 		return 0
 	fi
-	while [ $fixes_count -gt 0 ] ; do
+	while test $fixes_count -gt 0; do
 		# Treat only the current line
 		id=`echo "$fixes" | tail -n $fixes_count | head -n 1 | cut -d : -f 2`
 		fixes_count=$(($fixes_count-1))
@@ -41,7 +41,7 @@ is_sha_nomination()
 		# Bail out if we cannot find suitable id.
 		# Any specific validation the $id is valid and not some junk, is
 		# implied with the follow up code
-		if [ "x$id" = x ] ; then
+		if test "x$id" = x; then
 			continue
 		fi
 
@@ -87,7 +87,7 @@ git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fi
 while read sha
 do
 	# Check to see whether the patch is on the ignore list.
-	if [ -f bin/.cherry-ignore ] ; then
+	if test -f bin/.cherry-ignore; then
 		if grep -q ^$sha bin/.cherry-ignore ; then
 			continue
 		fi