From 577caa7d2b4a50ae9d4cb85fc4da864b1d54ea37 Mon Sep 17 00:00:00 2001
From: Omar Sandoval <osandov@fb.com>
Date: Mon, 15 Jun 2020 15:40:26 -0700
Subject: [PATCH] Fix unquoted integer shellcheck errors

Shellcheck apparently got stricter about SC2086 ("Double quote to
prevent globbing and word splitting") because now it is warning about
unquoted integers.
---
 common/multipath-over-rdma | 2 +-
 new                        | 2 +-
 tests/loop/006             | 2 +-
 tests/meta/006             | 2 +-
 tests/nvme/016             | 2 +-
 tests/nvme/017             | 2 +-
 tests/nvmeof-mp/001        | 2 +-
 tests/nvmeof-mp/rc         | 2 +-
 tests/srp/001              | 2 +-
 tests/srp/rc               | 8 ++++----
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma
index e689a96..1ac7202 100644
--- a/common/multipath-over-rdma
+++ b/common/multipath-over-rdma
@@ -258,7 +258,7 @@ remove_mpath_dev() {
 			stop_bdev_users "$(readlink -f "$1")"
 			sleep .5
 		done
-		if [ $i = 0 ]; then
+		if [[ $i = 0 ]]; then
 			echo "failed"
 			return 1
 		fi
diff --git a/new b/new
index 73f0faa..280cfb7 100755
--- a/new
+++ b/new
@@ -97,7 +97,7 @@ EOF
 fi
 
 for ((i = 1; ; i++)); do
-	seq="$(printf "%03d" $i)"
+	seq="$(printf "%03d" "$i")"
 	test_name="${group}/${seq}"
 	if [[ ! -e tests/${test_name} ]]; then
 		break
diff --git a/tests/loop/006 b/tests/loop/006
index 2ca2d75..81e597c 100755
--- a/tests/loop/006
+++ b/tests/loop/006
@@ -51,7 +51,7 @@ test() {
 	run_setter "$loop_dev" &
 	set_pid=$!
 
-	sleep ${TIMEOUT:-30}
+	sleep "${TIMEOUT:-30}"
 
 	# Discard KILLED messages from bash...
 	{
diff --git a/tests/meta/006 b/tests/meta/006
index 2d26307..4d5b84e 100755
--- a/tests/meta/006
+++ b/tests/meta/006
@@ -10,6 +10,6 @@ DESCRIPTION="produce lots of bad output"
 
 test() {
 	for ((i = 1; i <= 100; i++)); do
-		echo $i '¯\_(ツ)_/¯'
+		echo "$i" '¯\_(ツ)_/¯'
 	done
 }
diff --git a/tests/nvme/016 b/tests/nvme/016
index 9e670e7..f1e383c 100755
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -38,7 +38,7 @@ test() {
 	_remove_nvmet_port "${port}"
 
 	for ((i = iterations; i > 1; i--)); do
-		_remove_nvmet_ns "${subsys_nqn}" $i
+		_remove_nvmet_ns "${subsys_nqn}" "$i"
 	done
 
 	_remove_nvmet_subsystem "${subsys_nqn}"
diff --git a/tests/nvme/017 b/tests/nvme/017
index ef27de6..6787b5c 100755
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -41,7 +41,7 @@ test() {
 	_remove_nvmet_port "${port}"
 
 	for ((i = iterations; i > 1; i--)); do
-		_remove_nvmet_ns "${subsys_name}" $i
+		_remove_nvmet_ns "${subsys_name}" "$i"
 	done
 
 	_remove_nvmet_subsystem "${subsys_name}"
diff --git a/tests/nvmeof-mp/001 b/tests/nvmeof-mp/001
index 73af036..69f1e24 100755
--- a/tests/nvmeof-mp/001
+++ b/tests/nvmeof-mp/001
@@ -13,7 +13,7 @@ count_devices() {
 	for d in /sys/class/nvme-fabrics/ctl/*/*/device; do
 		[ -d "$d" ] && ((devs++))
 	done
-	echo $devs
+	echo "$devs"
 }
 
 wait_for_devices() {
diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index 136163b..e446db2 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -249,7 +249,7 @@ start_nvme_target() {
 				true
 			fi
 		done &&
-		if [ $num_ports = 0 ]; then
+		if [[ $num_ports = 0 ]]; then
 			echo "No NVMeOF target ports"
 			false
 		fi && (
diff --git a/tests/srp/001 b/tests/srp/001
index 63e6df9..c1b8011 100755
--- a/tests/srp/001
+++ b/tests/srp/001
@@ -19,7 +19,7 @@ count_luns() {
 		done
 		[ "$luns" -gt 0 ] && break
 	done
-	echo $luns
+	echo "$luns"
 }
 
 wait_for_luns() {
diff --git a/tests/srp/rc b/tests/srp/rc
index 3b82363..7fdea2d 100755
--- a/tests/srp/rc
+++ b/tests/srp/rc
@@ -464,9 +464,9 @@ configure_target_ports() {
 					cd "${ini}" &&
 					for ((i = 0; i < ${#vdevs[@]}; i++)) do
 					    (
-						    mkdir lun_$i &&
-							    cd lun_$i &&
-							    ln -s ../../../lun/lun_$i .
+						    mkdir "lun_$i" &&
+							    cd "lun_$i" &&
+							    ln -s "../../../lun/lun_$i" .
 					    ) || return $?
 					done
 			) || return $?
@@ -521,7 +521,7 @@ start_lio_srpt() {
 			oflag=
 		fi
 		echo -n "Zero-initializing $r ... " >>"$FULL"
-		dd if=/dev/zero of="${r}" bs=1M count=$((ramdisk_size>>20)) ${oflag} >/dev/null 2>&1 || return $?
+		dd if=/dev/zero of="${r}" bs=1M count=$((ramdisk_size>>20)) "$oflag" >/dev/null 2>&1 || return $?
 		echo "done" >>"$FULL"
 		mkdir -p "$(mountpoint $i)" || return $?
 		((i++))
-- 
2.49.0