s4:client: Reformat shell scripts

shfmt -f source4/client/ | xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

diff --git a/source4/client/tests/test_cifsdd.sh b/source4/client/tests/test_cifsdd.sh
index 404cb4688fa3707614d5b73364c72373c8189e32..21a884061bff8c8250bcd4296e22127f68e3be8d 100755 (executable)
--- a/source4/client/tests/test_cifsdd.sh
+++ b/source4/client/tests/test_cifsdd.sh
@@ -3,10 +3,10 @@
 # Basic script to make sure that cifsdd can do both local and remote I/O.
 
 if [ $# -lt 4 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_cifsdd.sh SERVER USERNAME PASSWORD DOMAIN
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=$1
@@ -14,7 +14,7 @@ USERNAME=$2
 PASSWORD=$3
 DOMAIN=$4
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 samba4bindir="$BINDIR"
 DD="$samba4bindir/cifsdd"
@@ -22,16 +22,18 @@ DD="$samba4bindir/cifsdd"
 SHARE=tmp
 DEBUGLEVEL=1
 
-runcopy() {
+runcopy()
+{
        message="$1"
        shift
-       
+
        testit "$message" $VALGRIND $DD $CONFIGURATION --debuglevel=$DEBUGLEVEL -W "$DOMAIN" -U "$USERNAME"%"$PASSWORD" \
-           "$@" || failed=`expr $failed + 1`
+               "$@" || failed=$(expr $failed + 1)
 }
 
-compare() {
-    testit "$1" cmp "$2" "$3" || failed=`expr $failed + 1`
+compare()
+{
+       testit "$1" cmp "$2" "$3" || failed=$(expr $failed + 1)
 }
 
 sourcefile=tempfile.src.$$
@@ -40,33 +42,33 @@ destfile=tempfile.dst.$$
 destpath=${SELFTEST_TMPDIR}/$destfile
 
 # Create a source file with arbitrary contents
-dd if=$DD of=$sourcepath bs=1024 count=50 > /dev/null
+dd if=$DD of=$sourcepath bs=1024 count=50 >/dev/null
 
 ls -l $sourcepath
 
-for bs in 512 4k 48k ; do
-
-echo "Testing $bs block size ..."
-
-# Check whether we can do local IO
-runcopy "Testing local -> local copy" if=$sourcepath of=$destpath bs=$bs
-compare "Checking local differences" $sourcepath $destpath
-
-# Check whether we can do a round trip
-runcopy "Testing local -> remote copy" \
-           if=$sourcepath of=//$SERVER/$SHARE/$sourcefile bs=$bs
-runcopy "Testing remote -> local copy" \
-           if=//$SERVER/$SHARE/$sourcefile of=$destpath bs=$bs
-compare "Checking differences" $sourcepath $destpath 
-
-# Check that copying within the remote server works
-runcopy "Testing local -> remote copy" \
-           if=//$SERVER/$SHARE/$sourcefile of=//$SERVER/$SHARE/$sourcefile bs=$bs
-runcopy "Testing remote -> remote copy" \
-           if=//$SERVER/$SHARE/$sourcefile of=//$SERVER/$SHARE/$destfile bs=$bs
-runcopy "Testing remote -> local copy" \
-           if=//$SERVER/$SHARE/$destfile of=$destpath bs=$bs
-compare "Checking differences" $sourcepath $destpath
+for bs in 512 4k 48k; do
+
+       echo "Testing $bs block size ..."
+
+       # Check whether we can do local IO
+       runcopy "Testing local -> local copy" if=$sourcepath of=$destpath bs=$bs
+       compare "Checking local differences" $sourcepath $destpath
+
+       # Check whether we can do a round trip
+       runcopy "Testing local -> remote copy" \
+               if=$sourcepath of=//$SERVER/$SHARE/$sourcefile bs=$bs
+       runcopy "Testing remote -> local copy" \
+               if=//$SERVER/$SHARE/$sourcefile of=$destpath bs=$bs
+       compare "Checking differences" $sourcepath $destpath
+
+       # Check that copying within the remote server works
+       runcopy "Testing local -> remote copy" \
+               if=//$SERVER/$SHARE/$sourcefile of=//$SERVER/$SHARE/$sourcefile bs=$bs
+       runcopy "Testing remote -> remote copy" \
+               if=//$SERVER/$SHARE/$sourcefile of=//$SERVER/$SHARE/$destfile bs=$bs
+       runcopy "Testing remote -> local copy" \
+               if=//$SERVER/$SHARE/$destfile of=$destpath bs=$bs
+       compare "Checking differences" $sourcepath $destpath
 
 done
 

diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 5560c55d90bd47f00a0ba6ba2091ca67f9d70c4e..1d87f90e60120a0fb846921eb72e4544d1773f01 100755 (executable)
--- a/source4/client/tests/test_smbclient.sh
+++ b/source4/client/tests/test_smbclient.sh
@@ -4,10 +4,10 @@
 # Copyright (C) 2006-2007 Andrew Bartlett <abartlet@samba.org>
 
 if [ $# -lt 5 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_smbclient.sh SERVER USERNAME PASSWORD DOMAIN PREFIX SMBCLIENT
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=$1
@@ -19,9 +19,10 @@ smbclient=$6
 shift 6
 failed=0
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
-runcmd() {
+runcmd()
+{
        name="$1"
        cmd="$2"
        shift
@@ -37,112 +38,112 @@ runcmd() {
        return $status
 }
 
-testit "share and server list" $VALGRIND $smbclient -L $SERVER $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "share and server list" $VALGRIND $smbclient -L $SERVER $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=$(expr $failed + 1)
 
-testit "share and server list anonymously" $VALGRIND $smbclient -N -L $SERVER $CONFIGURATION $@ || failed=`expr $failed + 1`
+testit "share and server list anonymously" $VALGRIND $smbclient -N -L $SERVER $CONFIGURATION $@ || failed=$(expr $failed + 1)
 
 # Use the smbclient binary as our test file
 cat $smbclient >$PREFIX/tmpfile
 
 # put that file
-runcmd "MPutting file" "lcd $PREFIX; mput tmpfile" || failed=`expr $failed + 1`
+runcmd "MPutting file" "lcd $PREFIX; mput tmpfile" || failed=$(expr $failed + 1)
 # check file info
-runcmd "Getting alternative name" 'altname tmpfile'|| failed=`expr $failed + 1`
+runcmd "Getting alternative name" 'altname tmpfile' || failed=$(expr $failed + 1)
 # run allinfo on that file
-runcmd "Checking info on file" 'allinfo tmpfile'|| failed=`expr $failed + 1`
+runcmd "Checking info on file" 'allinfo tmpfile' || failed=$(expr $failed + 1)
 # get that file
 mv $PREFIX/tmpfile $PREFIX/tmpfile-old
-runcmd "MGetting file" "lcd $PREFIX; mget tmpfile" || failed=`expr $failed + 1`
+runcmd "MGetting file" "lcd $PREFIX; mget tmpfile" || failed=$(expr $failed + 1)
 # remove that file
-runcmd "Removing file" 'rm tmpfile' || failed=`expr $failed + 1`
+runcmd "Removing file" 'rm tmpfile' || failed=$(expr $failed + 1)
 # compare locally
-testit "Comparing files" diff $PREFIX/tmpfile-old $PREFIX/tmpfile || failed=`expr $failed + 1`
+testit "Comparing files" diff $PREFIX/tmpfile-old $PREFIX/tmpfile || failed=$(expr $failed + 1)
 # create directory
 # cd to directory
 # cd to top level directory
 # remove directory
-runcmd "Creating directory, Changing directory, Going back" 'mkdir bla; cd bla; cd ..; rmdir bla' || failed=`expr $failed + 1`
+runcmd "Creating directory, Changing directory, Going back" 'mkdir bla; cd bla; cd ..; rmdir bla' || failed=$(expr $failed + 1)
 # enable recurse, create nested directory
-runcmd "Creating nested directory" 'mkdir bla/bloe' || failed=`expr $failed + 1`
+runcmd "Creating nested directory" 'mkdir bla/bloe' || failed=$(expr $failed + 1)
 # remove child directory
-runcmd "Removing directory" 'rmdir bla/bloe' || failed=`expr $failed + 1`
+runcmd "Removing directory" 'rmdir bla/bloe' || failed=$(expr $failed + 1)
 # remove parent directory
-runcmd "Removing directory" 'rmdir bla'|| failed=`expr $failed + 1`
+runcmd "Removing directory" 'rmdir bla' || failed=$(expr $failed + 1)
 # enable recurse, create nested directory
-runcmd "Creating nested directory" 'mkdir bla' || failed=`expr $failed + 1`
+runcmd "Creating nested directory" 'mkdir bla' || failed=$(expr $failed + 1)
 # rename bla to bla2
-runcmd "rename of nested directory" 'rename bla bla2' || failed=`expr $failed + 1`
+runcmd "rename of nested directory" 'rename bla bla2' || failed=$(expr $failed + 1)
 # deltree
-runcmd "deltree of nested directory" 'deltree bla2' || failed=`expr $failed + 1`
+runcmd "deltree of nested directory" 'deltree bla2' || failed=$(expr $failed + 1)
 # run fsinfo
-runcmd "Getting file system info" 'fsinfo allocation'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo volume'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo volumeinfo'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo sizeinfo'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo deviceinfo'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo attributeinfo'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo volume-information'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo size-information'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo device-information'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo attribute-information'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo quota-information'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo fullsize-information'|| failed=`expr $failed + 1`
-runcmd "Getting file system info" 'fsinfo objectid'|| failed=`expr $failed + 1`
+runcmd "Getting file system info" 'fsinfo allocation' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo volume' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo volumeinfo' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo sizeinfo' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo deviceinfo' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo attributeinfo' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo volume-information' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo size-information' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo device-information' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo attribute-information' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo quota-information' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo fullsize-information' || failed=$(expr $failed + 1)
+runcmd "Getting file system info" 'fsinfo objectid' || failed=$(expr $failed + 1)
 
 # put that file
-runcmd "Putting file" "lcd $PREFIX; put tmpfile" || failed=`expr $failed + 1`
+runcmd "Putting file" "lcd $PREFIX; put tmpfile" || failed=$(expr $failed + 1)
 # get that file
 mv $PREFIX/tmpfile $PREFIX/tmpfile-old
-runcmd "Getting file" "lcd $PREFIX; get tmpfile" || failed=`expr $failed + 1`
-runcmd "Getting file EA info" 'eainfo tmpfile'|| failed=`expr $failed + 1`
+runcmd "Getting file" "lcd $PREFIX; get tmpfile" || failed=$(expr $failed + 1)
+runcmd "Getting file EA info" 'eainfo tmpfile' || failed=$(expr $failed + 1)
 # remove that file
-runcmd "Removing file" 'rm tmpfile' || failed=`expr $failed + 1`
+runcmd "Removing file" 'rm tmpfile' || failed=$(expr $failed + 1)
 # compare locally
-testit "Comparing files" diff $PREFIX/tmpfile-old $PREFIX/tmpfile || failed=`expr $failed + 1`
+testit "Comparing files" diff $PREFIX/tmpfile-old $PREFIX/tmpfile || failed=$(expr $failed + 1)
 # put that file
-runcmd "Putting file with different name" "lcd $PREFIX; put tmpfile tmpfilex" || failed=`expr $failed + 1`
+runcmd "Putting file with different name" "lcd $PREFIX; put tmpfile tmpfilex" || failed=$(expr $failed + 1)
 # get that file
-runcmd "Getting file again" "lcd $PREFIX; get tmpfilex" || failed=`expr $failed + 1`
+runcmd "Getting file again" "lcd $PREFIX; get tmpfilex" || failed=$(expr $failed + 1)
 # compare locally
-testit "Comparing files" diff $PREFIX/tmpfilex $PREFIX/tmpfile || failed=`expr $failed + 1`
+testit "Comparing files" diff $PREFIX/tmpfilex $PREFIX/tmpfile || failed=$(expr $failed + 1)
 # remove that file
-runcmd "Removing file" 'rm tmpfilex'|| failed=`expr $failed + 1`
+runcmd "Removing file" 'rm tmpfilex' || failed=$(expr $failed + 1)
 
-runcmd "Lookup name" "lookup $DOMAIN\\$USERNAME" || failed=`expr $failed + 1`
+runcmd "Lookup name" "lookup $DOMAIN\\$USERNAME" || failed=$(expr $failed + 1)
 
 #Fails unless there are privileges
 #runcmd "Lookup privs of name" "privileges $DOMAIN\\$USERNAME" || failed=`expr $failed + 1`
 
 # do some simple operations using old protocol versions
-runcmd "List directory with LANMAN1" 'ls' -m LANMAN1 --option=clientntlmv2auth=no || failed=`expr $failed + 1`
-runcmd "List directory with LANMAN2" 'ls' -m LANMAN2 --option=clientntlmv2auth=no || failed=`expr $failed + 1`
+runcmd "List directory with LANMAN1" 'ls' -m LANMAN1 --option=clientntlmv2auth=no || failed=$(expr $failed + 1)
+runcmd "List directory with LANMAN2" 'ls' -m LANMAN2 --option=clientntlmv2auth=no || failed=$(expr $failed + 1)
 
-runcmd "Print current working directory" 'pwd'|| failed=`expr $failed + 1`
+runcmd "Print current working directory" 'pwd' || failed=$(expr $failed + 1)
 
 (
-    echo "password=$PASSWORD"
-    echo "username=$USERNAME"
-    echo "domain=$DOMAIN"
-) > $PREFIX/tmpauthfile
+       echo "password=$PASSWORD"
+       echo "username=$USERNAME"
+       echo "domain=$DOMAIN"
+) >$PREFIX/tmpauthfile
 
-testit "Test login with --authentication-file" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --authentication-file=$PREFIX/tmpauthfile  || failed=`expr $failed + 1`
+testit "Test login with --authentication-file" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --authentication-file=$PREFIX/tmpauthfile || failed=$(expr $failed + 1)
 
 PASSWD_FILE="$PREFIX/tmppassfile"
-echo "$PASSWORD" > $PASSWD_FILE
+echo "$PASSWORD" >$PASSWD_FILE
 export PASSWD_FILE
-testit "Test login with PASSWD_FILE" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME" || failed=`expr $failed + 1`
+testit "Test login with PASSWD_FILE" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME" || failed=$(expr $failed + 1)
 PASSWD_FILE=""
 export PASSWD_FILE
 unset PASSWD_FILE
 
-PASSWD="$PASSWORD" 
+PASSWD="$PASSWORD"
 export PASSWD
-testit "Test login with PASSWD" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME" || failed=`expr $failed + 1`
+testit "Test login with PASSWD" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME" || failed=$(expr $failed + 1)
 
 oldUSER=$USER
-USER="$USERNAME" 
+USER="$USERNAME"
 export USER
-testit "Test login with USER and PASSWD" $VALGRIND $smbclient --use-kerberos=disabled -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" || failed=`expr $failed + 1`
+testit "Test login with USER and PASSWD" $VALGRIND $smbclient --use-kerberos=disabled -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" || failed=$(expr $failed + 1)
 PASSWD=
 export PASSWD
 unset PASSWD