Eliminate trailing spaces in DISKS

The zfs-tests.sh driver script could add spaces to the end of $DISKS which defeates shell-based parsing with constructs such as ${DISKS##* }. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tim Chase <[email protected]> Issue openzfs#6900
openzfsonwindows · Apr 14, 2018 · 5c596ba · 5c596ba
1 parent 93b43af
commit 5c596ba
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh
@@ -505,7 +505,11 @@ if [ -z "${DISKS}" ]; then
 		[ -f "$TEST_FILE" ] && fail "Failed file exists: ${TEST_FILE}"
 		truncate -s "${FILESIZE}" "${TEST_FILE}" ||
 		    fail "Failed creating: ${TEST_FILE} ($?)"
-		DISKS="$DISKS$TEST_FILE "
+		if [[ "$DISKS" ]]; then
+			DISKS="$DISKS $TEST_FILE"
+		else
+			DISKS="$TEST_FILE"
+		fi
 	done
 
 	#
@@ -522,7 +526,11 @@ if [ -z "${DISKS}" ]; then
 			    fail "Failed: ${TEST_FILE} -> ${TEST_LOOPBACK}"
 			LOOPBACKS="${LOOPBACKS}${TEST_LOOPBACK} "
 			BASELOOPBACKS=$(basename "$TEST_LOOPBACK")
-			DISKS="$DISKS$BASELOOPBACKS "
+			if [[ "$DISKS" ]]; then
+				DISKS="$DISKS $BASELOOPBACKS"
+			else
+				DISKS="$BASELOOPBACKS"
+			fi
 		done
 	fi
 fi