diff --git a/bin/helper/osh-groupCreate b/bin/helper/osh-groupCreate index 80c0f56..5b5bf20 100755 --- a/bin/helper/osh-groupCreate +++ b/bin/helper/osh-groupCreate @@ -195,7 +195,6 @@ foreach my $gr ("$group-owner", "$group-gatekeeper", "$group-aclkeeper", "osh-wh or HEXIT('ERR_SETFACL_FAILED', msg => "Error setting ACLs on group homedir"); } - osh_debug("Adding allowkeeper to group $group"); $fnret = OVH::Bastion::add_user_to_group(group => $group, user => 'allowkeeper', groupType => 'key'); $fnret or HEXIT($fnret); diff --git a/tests/functional/docker/docker_build_and_run_tests.sh b/tests/functional/docker/docker_build_and_run_tests.sh index f75d149..4d4de9d 100755 --- a/tests/functional/docker/docker_build_and_run_tests.sh +++ b/tests/functional/docker/docker_build_and_run_tests.sh @@ -15,10 +15,11 @@ get_supported_targets() { local target targets subtarget for dockerfile in "$(dirname "$0")"/../../../docker/Dockerfile.*; do if grep -q '^# TESTENV ' "$dockerfile"; then - target=$(basename $dockerfile) + target=$(basename "$dockerfile") target=${target/Dockerfile./} # if the file has a TESTFROM entry, then it's actually multiple similar targets if grep -q '^# TESTFROM ' "$dockerfile"; then + # shellcheck disable=SC2013 for testfrom in $(grep '^# TESTFROM ' "$dockerfile" | cut -d' ' -f3-); do subtarget="$target@$testfrom" targets="$targets $subtarget" @@ -27,6 +28,7 @@ get_supported_targets() { targets="$targets $target" fi done + # shellcheck disable=SC2086 echo $targets }