From 85934d62d767a484fa560066b6edb69a18145690 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Thu, 26 Oct 2017 02:32:54 -0400
Subject: Replace usage of the '[' Bash builtin with '[['

There's no benefit to using the POSIX-style '[' test builtin
considering its '-a' and '-o' operators are unused in the Libreboot
build system.  Plus, '[[' is safer with respect to any containing file
redirections (for example).

Prior, both '[' and '[[' were used throughout the codebase--a
disparity in usage which this change aims to eliminate.
---
 tools/blobs-discover/blobs-discover | 18 +++++++++---------
 tools/boot-keys/boot-keys           |  8 ++++----
 tools/boot-keys/boot-keys-helper    |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tools')

diff --git a/tools/blobs-discover/blobs-discover b/tools/blobs-discover/blobs-discover
index 6d143d02..3ced106c 100755
--- a/tools/blobs-discover/blobs-discover
+++ b/tools/blobs-discover/blobs-discover
@@ -18,7 +18,7 @@
 arguments() {
 	local project=$1
 
-	if [ -z "$project" ]
+	if [[ -z "$project" ]]
 	then
 		ls -A "$root/$PROJECTS/" | while read project
 		do
@@ -50,7 +50,7 @@ update() {
 
 	path_wildcard_expand "$patches_path" | while read patch_path
 	do
-		if ! [ -f "$patch_path" ]
+		if ! [[ -f "$patch_path" ]]
 		then
 			continue
 		fi
@@ -75,7 +75,7 @@ verify() {
 
 	requirements "sort"
 
-	if ! [ -z "$project_blobs_path" ]
+	if ! [[ -z "$project_blobs_path" ]]
 	then
 		project_blobs_discover_path="$( dirname $project_blobs_path )/$BLOBS_DISCOVER"
 	else
@@ -100,7 +100,7 @@ verify() {
 			printf '%s' "Type \"blob\" to keep or press enter to discard: "
 			read choice
 
-			if [ "$choice" = "blob" ]
+			if [[ "$choice" = "blob" ]]
 			then
 				printf '%s\n' "$file" >> "$project_blobs_path"
 			else
@@ -136,7 +136,7 @@ execute() {
 	local project_blobs_ignore_path=$( project_blobs_ignore_path "$project" "$@" )
 	local project_blobs_directory_path
 
-	if ! [ -z "$project_blobs_path" ]
+	if ! [[ -z "$project_blobs_path" ]]
 	then
 		project_blobs_discover_path="$( dirname $project_blobs_path )/$BLOBS_DISCOVER"
 	else
@@ -159,17 +159,17 @@ execute() {
 
 	printf '%s\n' "$files" | while read file
 	do
-		if ! [ -z "$project_blobs_ignore_path" ]
+		if ! [[ -z "$project_blobs_ignore_path" ]]
 		then
 			match=$( grep "$file" "$project_blobs_ignore_path" || true)
-			if [ ! -z "$match" ]
+			if [[ ! -z "$match" ]]
 			then
 				continue
 			fi
 		fi
 
 		match=$( "$deblob_check_path" -l -i "" "$file" || true )
-		if ! [ -z "$match" ]
+		if ! [[ -z "$match" ]]
 		then
 			printf '%s\n' "$match" >> "$project_blobs_discover_path"
 		fi
@@ -187,7 +187,7 @@ execute_check() {
 	local project_blobs_ignore_path=$( project_blobs_ignore_path "$project" "$@" )
 	local project_blobs_discover_path
 
-	if ! [ -z "$project_blobs_path" ]
+	if ! [[ -z "$project_blobs_path" ]]
 	then
 		project_blobs_discover_path="$( dirname $project_blobs_path )/$BLOBS_DISCOVER"
 	else
diff --git a/tools/boot-keys/boot-keys b/tools/boot-keys/boot-keys
index a556aa41..5d133742 100755
--- a/tools/boot-keys/boot-keys
+++ b/tools/boot-keys/boot-keys
@@ -22,7 +22,7 @@ usage() {
 generate() {
 	local type=$( boot_keys_type "$@" )
 
-	if [ -z "$type" ]
+	if [[ -z "$type" ]]
 	then
 		printf 1>&2 '%s\n' 'Unable to determine keys type'
 		return 1
@@ -45,7 +45,7 @@ sign() {
 	local kernel_path
 	local media
 
-	if [ -z "$type" ]
+	if [[ -z "$type" ]]
 	then
 		printf 1>&2 '%s\n' 'Unable to determine keys type'
 		return 1
@@ -66,7 +66,7 @@ sign() {
 				do
 					kernel_path="$install_path/$KERNEL-$medium.$IMG"
 
-					if [ -f "$kernel_path" ]
+					if [[ -f "$kernel_path" ]]
 					then
 						boot_keys_cros "$type-prepare" "sign" "$kernel_path"
 					else
@@ -88,7 +88,7 @@ verify() {
 	local kernel_path
 	local media
 
-	if [ -z "$type" ]
+	if [[ -z "$type" ]]
 	then
 		printf 1>&2 '%s\n' 'Unable to determine keys type'
 		return 1
diff --git a/tools/boot-keys/boot-keys-helper b/tools/boot-keys/boot-keys-helper
index 5d01916a..df53ec5b 100755
--- a/tools/boot-keys/boot-keys-helper
+++ b/tools/boot-keys/boot-keys-helper
@@ -13,7 +13,7 @@ boot_keys_cros() {
 	local cros_scripts_path=$( project_install_path "cros-scripts" )
 	local cros_script_path="$cros_scripts_path/$cros_script"
 
-	if ! [ -x "$cros_script_path" ]
+	if ! [[ -x "$cros_script_path" ]]
 	then
 		printf 1>&2 '%s' "$cros_script script missing from cros-scripts install"
 		return 1
@@ -37,7 +37,7 @@ boot_keys_files_install_path() {
 	helper_arguments=$( project_action_helper "arguments" "$project" "$@" )
 
 
-	if [ $? -ne 0 ] || [ -z "$helper_arguments" ]
+	if [[ $? -ne 0 ]] || [[ -z "$helper_arguments" ]]
 	then
 		project_install_path "$project" "$@"
 	else
-- 
cgit v1.2.3-70-g09d2