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.

diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma
index e689a9633d131db8528758a44569bff3ac58e5d7..1ac7202bcea7091a8cced7454548502f06972c07 100644 (file)
--- 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 73f0faa8fa969f41769c256dd3b94677ee60bce0..280cfb79ca24253bc420fc5fb18fcc91b2fce269 100755 (executable)
--- 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 2ca2d75060b7ff56497d5195689ab9b3bc2e2556..81e597c7ab645f3e2d5b71b38140aabb32507582 100755 (executable)
--- 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 2d263077b06f511ed72b1d62d96dafbf55362453..4d5b84e64ed3e2eb2ebb5cb85aa96360b212a3f6 100755 (executable)
--- 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 9e670e7f6bcdd69d0e86038db01017ac2f15cca2..f1e383cb441a6ae808f7e1ed13181630de903c6a 100755 (executable)
--- 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 ef27de65cf2e7ac9a9facdaad2e321c94c2d5d37..6787b5c754baf8b728b16df35f36f16bcdbfa38a 100755 (executable)
--- 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 73af036a3d69ef912ba300e4f4e3273c9aab97ff..69f1e242934f9f5fc1807b4a9610da10a5a20784 100755 (executable)
--- 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 136163bc73adc307dc7b5c066cd9175647eeb4ef..e446db297ba1a424511115b7351ab95ce482b44c 100755 (executable)
--- 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 63e6df9f6da7bbc67cef575f8b94402849cda154..c1b801101782110c999e9a8d85dcaca73eb370e7 100755 (executable)
--- 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 3b82363f4eee3398bfc63835a8d92eec2599af94..7fdea2d1dccc8b2467a3e8a5788bb5a56e1ed7ae 100755 (executable)
--- 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++))