From 447e6b929104b88a10cf29288c0cb7b1c1b386c6 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 13 Jun 2022 15:31:38 +0200 Subject: testprogs: Fix shellcheck errors in dbcheck-oldrelease.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit testprogs/blackbox/dbcheck-oldrelease.sh:249:95: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:304:166: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:316:128: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:325:145: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:398:197: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:420:97: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:428:134: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:438:122: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:446:146: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:455:134: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:474:146: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/dbcheck-oldrelease.sh:483:134: error: Double quote array expansions to avoid re-splitting elements. [SC2068] Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- testprogs/blackbox/dbcheck-oldrelease.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'testprogs') diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh index 2df08ade13f..635ada9414c 100755 --- a/testprogs/blackbox/dbcheck-oldrelease.sh +++ b/testprogs/blackbox/dbcheck-oldrelease.sh @@ -246,7 +246,7 @@ check_expected_userparameters() reindex() { - $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" } do_current_version_mod() @@ -301,7 +301,7 @@ check_expected_before_values() dbcheck_objectclass() { if [ x$RELEASE = x"release-4-1-6-partial-object" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --attrs=objectclass $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --attrs=objectclass "$@" else return 1 fi @@ -313,7 +313,7 @@ dbcheck_deleted_objects() if [ x$RELEASE = x"alpha13" ]; then basedn=$($ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope base -b "" defaultNamingContext | grep -i defaultNamingContext | cut -d\ -f 2) - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "cn=deleted objects,$basedn" --scope base $@ + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "cn=deleted objects,$basedn" --scope base "$@" else return 1 fi @@ -322,7 +322,7 @@ dbcheck_deleted_objects() # This should 'fail', because it returns the number of modified records dbcheck() { - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" } check_expected_after_values() @@ -395,7 +395,7 @@ check_forced_duplicate_values() dbcheck_after_dup() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp "$@" else return 1 fi @@ -417,7 +417,7 @@ check_expected_after_dup_values() # But having fixed it all up, this should pass dbcheck_clean() { - $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" } # This should 'fail', because it returns the number of modified records. @@ -425,7 +425,7 @@ dbcheck_clean() dbcheck_acl_reset() { if [ x$RELEASE = x"release-4-0-0" -o x$RELEASE = x"alpha13" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" else return 1 fi @@ -435,7 +435,7 @@ dbcheck_acl_reset() dbcheck_acl_reset_clean() { if [ x$RELEASE != x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" fi } @@ -443,7 +443,7 @@ dbcheck_acl_reset_clean() dbcheck2() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" else exit 1 fi @@ -452,7 +452,7 @@ dbcheck2() dbcheck_clean2() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" fi } @@ -471,7 +471,7 @@ rm_deleted_objects() dbcheck3() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" else exit 1 fi @@ -480,7 +480,7 @@ dbcheck3() dbcheck_clean3() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" fi } -- cgit v1.2.1