From c4c086ecc00899741d114e6dc51b5cfcfd1d0707 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 23 Feb 2022 12:04:57 +0100 Subject: [PATCH] s4:utils: Reformat shell scripts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit shfmt -f source4/utils/ | xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský Autobuild-User(master): Pavel Filipensky Autobuild-Date(master): Fri Jul 8 09:59:19 UTC 2022 on sn-devel-184 --- source4/utils/tests/test_nmblookup.sh | 5 +++-- source4/utils/tests/test_samba_tool.sh | 7 ++++--- source4/utils/tests/test_smbclient.sh | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source4/utils/tests/test_nmblookup.sh b/source4/utils/tests/test_nmblookup.sh index 5e4fcfb4069..db2686e35b1 100755 --- a/source4/utils/tests/test_nmblookup.sh +++ b/source4/utils/tests/test_nmblookup.sh @@ -11,7 +11,8 @@ TORTURE_OPTIONS=$* failed=0 -testit() { +testit() +{ name="$1" shift cmdline="$*" @@ -22,7 +23,7 @@ testit() { echo "success: $name" else echo "failure: $name" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi return $status } diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh index d2548d04689..d45a2333ed1 100755 --- a/source4/utils/tests/test_samba_tool.sh +++ b/source4/utils/tests/test_samba_tool.sh @@ -14,7 +14,8 @@ failed=0 samba4bindir="$BINDIR" samba_tool="$samba4bindir/samba-tool" -testit() { +testit() +{ name="$1" shift cmdline="$*" @@ -25,7 +26,7 @@ testit() { echo "success: $name" else echo "failure: $name" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi return $status } @@ -34,7 +35,7 @@ testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k -testit "time" $VALGRIND $PYTHON $samba_tool time $SERVER $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ +testit "time" $VALGRIND $PYTHON $samba_tool time $SERVER $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ testit "domain level.show" $VALGRIND $PYTHON $samba_tool domain level show diff --git a/source4/utils/tests/test_smbclient.sh b/source4/utils/tests/test_smbclient.sh index 1a592518f57..9b3e8dc76b6 100755 --- a/source4/utils/tests/test_smbclient.sh +++ b/source4/utils/tests/test_smbclient.sh @@ -11,7 +11,8 @@ shift 6 failed=0 -testit() { +testit() +{ name="$1" shift cmdline="$*" @@ -22,7 +23,7 @@ testit() { echo "success: $name" else echo "failure: $name" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi return $status } -- 2.47.3