From 9a7ceef09ea1fc8cbe17b324a9d1a2e71e50cb0a Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 13 Apr 2020 13:09:27 +0200
Subject: shellcheck: make top-level bash scripts warning-free

And run shellcheck in test.bash.
---
 test.bash | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'test.bash')

diff --git a/test.bash b/test.bash
index 6691ffb..91def59 100755
--- a/test.bash
+++ b/test.bash
@@ -12,14 +12,14 @@ set -eu
 cd "$(dirname "$0")"
 MYNAME=$(basename "$0")
 TESTDIR=$TMPDIR/gocryptfs-test-parent-$UID
-mkdir -p $TESTDIR
+mkdir -p "$TESTDIR"
 LOCKFILE=$TESTDIR/$MYNAME.lock
 
 function unmount_leftovers {
 	RET=0
-	for i in $(mount | grep $TESTDIR | cut -f3 -d" "); do
+	for i in $(mount | grep "$TESTDIR" | cut -f3 -d" "); do
 		echo "Warning: unmounting leftover filesystem: $i"
-		tests/fuse-unmount.bash $i
+		tests/fuse-unmount.bash "$i"
 		RET=1
 	done
 	return $RET
@@ -40,7 +40,7 @@ unmount_leftovers || true
 
 ./build-without-openssl.bash
 # Don't build with openssl if we were passed "-tags without_openssl"
-if [[ "$@" != *without_openssl* ]] ; then
+if [[ "$*" != *without_openssl* ]] ; then
 	./build.bash
 fi
 
@@ -52,6 +52,13 @@ else
 	go vet "$@" .
 fi
 
+if command -v shellcheck > /dev/null ; then
+	# SC2002 = useless cat. Does no harm, disable the check.
+	shellcheck -x -e SC2002 ./*.bash
+else
+	echo "shellcheck not installed - skipping"
+fi
+
 #            We don't want all the subprocesses
 #               holding the lock file open
 #                         vvvvv
@@ -65,15 +72,15 @@ unmount_leftovers || { echo "Error: the tests left mounted filesystems behind" ;
 # The tests cannot to this themselves as they are run in parallel.
 # Don't descend into possibly still mounted example filesystems.
 if [[ $OSTYPE == *linux* ]] ; then
-	rm -Rf --one-file-system $TESTDIR
+	rm -Rf --one-file-system "$TESTDIR"
 else
 	# MacOS "rm" does not understand "--one-file-system"
-	rm -Rf $TESTDIR
+	rm -Rf "$TESTDIR"
 fi
 
-if grep -R "panic(" *.go internal ; then
+if grep -R "panic(" ./*.go internal ; then
 	echo "Please use log.Panic instead of naked panic!"
 	exit 1
 fi
 
-) 200> $LOCKFILE
+) 200> "$LOCKFILE"
-- 
cgit v1.2.3