From fdf6b04531b0fae0859496fa0b2ab9aac1e49c5c Mon Sep 17 00:00:00 2001
From: Maciej Wawryk <maciejx.wawryk@intel.com>
Date: Tue, 1 Oct 2019 11:25:30 +0200
Subject: [PATCH] test: Shellcheck - correct rule: "unlike globs"

Correct shellcheck rule SC2022: Note that unlike globs,
o* here matches 'ooo' but not 'oscar'

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ie201a8401c5c501e1fff3d0eb71409163893768e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469983
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 scripts/check_format.sh      | 2 +-
 test/nvmf/target/nvme_cli.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index 77fde7002..418735329 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -242,7 +242,7 @@ if hash shellcheck 2>/dev/null; then
 	# This SHCK_EXCLUDE list is out "to do" and we work to fix all of this errors.
 	SHCK_EXCLUDE="SC1001,SC1003,SC1010,\
 SC1083,SC1113,SC2001,SC2002,SC2003,SC2004,SC2005,\
-SC2010,SC2012,SC2013,SC2015,SC2016,SC2018,SC2019,SC2022,\
+SC2010,SC2012,SC2013,SC2015,SC2016,SC2018,SC2019,\
 SC2027,SC2030,SC2031,SC2034,SC2035,SC2039,SC2043,SC2044,SC2045,SC2046,\
 SC2068,SC2086,SC2089,SC2090,\
 SC2097,SC2098,SC2103,SC2115,SC2116,SC2119,SC2120,SC2121,SC2124,SC2126,SC2128,\
diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh
index 3b633a8f5..0c508bfc6 100755
--- a/test/nvmf/target/nvme_cli.sh
+++ b/test/nvmf/target/nvme_cli.sh
@@ -59,10 +59,10 @@ if [ -d  $spdk_nvme_cli ]; then
 	cd $spdk_nvme_cli
 	sed -i 's/shm_id=.*/shm_id=-1/g' spdk.conf
 	./nvme discover -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT"
-	nvme_num_before_connection=$(nvme list |grep "/dev/nvme*"|awk '{print $1}'|wc -l)
+	nvme_num_before_connection=$(nvme list |grep "/dev/nvme"|awk '{print $1}'|wc -l)
 	./nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 	sleep 1
-	nvme_num=$(nvme list |grep "/dev/nvme*"|awk '{print $1}'|wc -l)
+	nvme_num=$(nvme list |grep "/dev/nvme"|awk '{print $1}'|wc -l)
 	./nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 	if [ $nvme_num -le $nvme_num_before_connection ]; then
 		echo "spdk/nvme-cli connect target devices failed"