From: Andreas Schneider <asn@samba.org>
Date: Fri, 22 Apr 2022 13:34:11 +0000 (+0200)
Subject: s3:tests: Reformat test_valid_users.sh
X-Git-Tag: tevent-0.13.0~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a83032981971624ccb06b9eeadbf0d0b2d9ef1e2;p=thirdparty%2Fsamba.git

s3:tests: Reformat test_valid_users.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---

diff --git a/source3/script/tests/test_valid_users.sh b/source3/script/tests/test_valid_users.sh
index a7f9333b243..659eb6abaa2 100755
--- a/source3/script/tests/test_valid_users.sh
+++ b/source3/script/tests/test_valid_users.sh
@@ -4,10 +4,10 @@
 #
 
 if [ $# -lt 7 ]; then
-cat <<EOF
+	cat <<EOF
 Usage: valid_users SERVER SERVER_IP DOMAIN USERNAME PASSWORD PREFIX SMBCLIENT
 EOF
-exit 1;
+	exit 1
 fi
 
 SERVER=${1}
@@ -21,7 +21,7 @@ shift 7
 SMBCLIENT="$VALGRIND ${SMBCLIENT}"
 ADDARGS="$*"
 
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
 failed=0
@@ -29,42 +29,42 @@ failed=0
 # Test listing a share with valid users succeeds
 test_valid_users_access()
 {
-    tmpfile=$PREFIX/smbclient.in.$$
-    prompt="foo"
-    cat > $tmpfile <<EOF
+	tmpfile=$PREFIX/smbclient.in.$$
+	prompt="foo"
+	cat >$tmpfile <<EOF
 ls
 quit
 EOF
 
-    cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$1" -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
-    eval echo "$cmd"
-    out=`eval $cmd`
-    ret=$?
-    rm -f $tmpfile
+	cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$1" -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
+	eval echo "$cmd"
+	out=$(eval $cmd)
+	ret=$?
+	rm -f $tmpfile
 
-    if [ $ret != 0 ] ; then
-        echo "$out"
-        echo "failed accessing share with valid users with error $ret"
+	if [ $ret != 0 ]; then
+		echo "$out"
+		echo "failed accessing share with valid users with error $ret"
 
-        false
-        return
-    fi
+		false
+		return
+	fi
 
-    echo "$out" | grep "$prompt" >/dev/null 2>&1
+	echo "$out" | grep "$prompt" >/dev/null 2>&1
 
-    ret=$?
-    if [ $ret = 0 ] ; then
-        # got the correct prompt .. succeed
-        true
-    else
-        echo "$out"
-        echo "failed listing share with valid users"
-        false
-    fi
+	ret=$?
+	if [ $ret = 0 ]; then
+		# got the correct prompt .. succeed
+		true
+	else
+		echo "$out"
+		echo "failed listing share with valid users"
+		false
+	fi
 }
 
 testit "accessing a valid users share succeeds" \
-   test_valid_users_access valid-users-access || \
-   failed=`expr $failed + 1`
+	test_valid_users_access valid-users-access ||
+	failed=$(expr $failed + 1)
 
 exit $failed