diff options
author | Richard Samuels <richard.l.samuels@gmail.com> | 2021-06-24 19:45:51 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-07-02 02:08:51 +0000 |
commit | 8a30e2e888640f58bd7e5134e14b39de4b0b1491 (patch) | |
tree | 72e16e9201e83f34265e0ed3a595b9e5794e0e32 | |
parent | 951dfeb5aca55cc881293372dfda4b72bb478b92 (diff) | |
download | mongo-8a30e2e888640f58bd7e5134e14b39de4b0b1491.tar.gz |
SERVER-57140 reformat shell scripts and allow space between redirect operators
94 files changed, 162 insertions, 162 deletions
diff --git a/buildscripts/shellscripts-linters.sh b/buildscripts/shellscripts-linters.sh index 6df3d53572d..a25b45bd466 100755 --- a/buildscripts/shellscripts-linters.sh +++ b/buildscripts/shellscripts-linters.sh @@ -14,13 +14,13 @@ fi lint_dirs="evergreen" if [ "$1" = "fix" ]; then - shfmt -w -i 2 -bn "$lint_dirs" + shfmt -w -i 2 -bn -sr "$lint_dirs" fi output_file="shfmt_output.txt" exit_code=0 -shfmt -d -i 2 -bn "$lint_dirs" >"$output_file" +shfmt -d -i 2 -bn -sr "$lint_dirs" >"$output_file" if [ -s "$output_file" ]; then echo "ERROR: Found formatting errors in shell script files in directories: $lint_dirs" echo "" diff --git a/evergreen/blackduck_hub.sh b/evergreen/blackduck_hub.sh index 63630a34456..f7edf2d486e 100755 --- a/evergreen/blackduck_hub.sh +++ b/evergreen/blackduck_hub.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/blackduck_setup.sh b/evergreen/blackduck_setup.sh index 68f553a2a6f..8ed396833a3 100755 --- a/evergreen/blackduck_setup.sh +++ b/evergreen/blackduck_setup.sh @@ -1,10 +1,10 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src # Create the Evergreen API credentials -cat >.restconfig.json <<END_OF_CREDS +cat > .restconfig.json << END_OF_CREDS { "baseurl": "${blackduck_url}", "username": "${blackduck_username}", diff --git a/evergreen/burn_in_tests.sh b/evergreen/burn_in_tests.sh index 66330a0386d..8293da84acb 100755 --- a/evergreen/burn_in_tests.sh +++ b/evergreen/burn_in_tests.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/burn_in_tests_generate.sh b/evergreen/burn_in_tests_generate.sh index 0419795c1a0..6a876b3b723 100644 --- a/evergreen/burn_in_tests_generate.sh +++ b/evergreen/burn_in_tests_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/burn_in_tests_multiversion.sh b/evergreen/burn_in_tests_multiversion.sh index 0aa24319b53..4920fa9e601 100755 --- a/evergreen/burn_in_tests_multiversion.sh +++ b/evergreen/burn_in_tests_multiversion.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/check_idl_compat.sh b/evergreen/check_idl_compat.sh index 2e8a3e2ab21..d50b63f86f2 100755 --- a/evergreen/check_idl_compat.sh +++ b/evergreen/check_idl_compat.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/commit_message_validate.sh b/evergreen/commit_message_validate.sh index 64883e98a9c..687aea5ed6c 100644 --- a/evergreen/commit_message_validate.sh +++ b/evergreen/commit_message_validate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -9,7 +9,7 @@ if [ "${is_commit_queue}" = "true" ]; then # Since `commit_message` is an evergreen expansion, we need a way to ensure we # properly deal with any special characters that could cause issues (like "). To # do this, we will write it out to a file, then read that file into a variable. - cat >commit_message.txt <<END_OF_COMMIT_MSG + cat > commit_message.txt << END_OF_COMMIT_MSG ${commit_message} END_OF_COMMIT_MSG diff --git a/evergreen/compile_ninja.sh b/evergreen/compile_ninja.sh index 63c4b0a62fc..a50ec6c3de4 100644 --- a/evergreen/compile_ninja.sh +++ b/evergreen/compile_ninja.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/compiled_binaries_get.sh b/evergreen/compiled_binaries_get.sh index 4073f2b1701..fc4507173d1 100755 --- a/evergreen/compiled_binaries_get.sh +++ b/evergreen/compiled_binaries_get.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/do_jepsen_setup/nodes.sh b/evergreen/do_jepsen_setup/nodes.sh index 0df79badc1e..650f4fb1dfa 100644 --- a/evergreen/do_jepsen_setup/nodes.sh +++ b/evergreen/do_jepsen_setup/nodes.sh @@ -1,8 +1,8 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src set -o errexit activate_venv -$python -c 'import socket; num_nodes = 5; print("\n".join(["%s:%d" % (socket.gethostname(), port) for port in range(20000, 20000 + num_nodes)]))' >nodes.txt +$python -c 'import socket; num_nodes = 5; print("\n".join(["%s:%d" % (socket.gethostname(), port) for port in range(20000, 20000 + num_nodes)]))' > nodes.txt diff --git a/evergreen/embedded_sdk_build_cdriver.sh b/evergreen/embedded_sdk_build_cdriver.sh index 031a352cd9b..68ad11779d0 100755 --- a/evergreen/embedded_sdk_build_cdriver.sh +++ b/evergreen/embedded_sdk_build_cdriver.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" set -o errexit diff --git a/evergreen/embedded_sdk_run_tests.sh b/evergreen/embedded_sdk_run_tests.sh index dfb7ac77981..c5298712972 100755 --- a/evergreen/embedded_sdk_run_tests.sh +++ b/evergreen/embedded_sdk_run_tests.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/embedded_sdk_run_tests_post.sh b/evergreen/embedded_sdk_run_tests_post.sh index 5faf166bced..c091afb7f51 100755 --- a/evergreen/embedded_sdk_run_tests_post.sh +++ b/evergreen/embedded_sdk_run_tests_post.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/build diff --git a/evergreen/embedded_sdk_s3_tar.sh b/evergreen/embedded_sdk_s3_tar.sh index d647966464a..6f5ff4a8e28 100755 --- a/evergreen/embedded_sdk_s3_tar.sh +++ b/evergreen/embedded_sdk_s3_tar.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/build @@ -7,7 +7,7 @@ cd src/build set -o errexit set -o verbose -cat <<EOF >mongo-embedded-sdk-${version}/README-Licenses.txt +cat << EOF > mongo-embedded-sdk-${version}/README-Licenses.txt The software accompanying this file is Copyright (C) 2018 MongoDB, Inc. and is licensed to you on the terms set forth in the following files: - mongo-c-driver: share/doc/mongo-c-driver/COPYING diff --git a/evergreen/embedded_sdk_tests_s3_put.sh b/evergreen/embedded_sdk_tests_s3_put.sh index 78c9a72997f..d1138298d42 100755 --- a/evergreen/embedded_sdk_tests_s3_put.sh +++ b/evergreen/embedded_sdk_tests_s3_put.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/build diff --git a/evergreen/embedded_sdk_tests_s3_tar.sh b/evergreen/embedded_sdk_tests_s3_tar.sh index e3950f0d365..e7d594adf2b 100755 --- a/evergreen/embedded_sdk_tests_s3_tar.sh +++ b/evergreen/embedded_sdk_tests_s3_tar.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/build diff --git a/evergreen/explicit_multiversion_tasks_generate.sh b/evergreen/explicit_multiversion_tasks_generate.sh index eefbc68fd40..d9d6dd71ffd 100644 --- a/evergreen/explicit_multiversion_tasks_generate.sh +++ b/evergreen/explicit_multiversion_tasks_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/external_auth_aws_pip.sh b/evergreen/external_auth_aws_pip.sh index 360330738a7..1395fa6698e 100755 --- a/evergreen/external_auth_aws_pip.sh +++ b/evergreen/external_auth_aws_pip.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" set -o errexit diff --git a/evergreen/external_auth_aws_setup.sh b/evergreen/external_auth_aws_setup.sh index 07d826e72f9..c59b025028c 100755 --- a/evergreen/external_auth_aws_setup.sh +++ b/evergreen/external_auth_aws_setup.sh @@ -1,10 +1,10 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src set -o errexit -cat <<EOF >aws_e2e_setup.json +cat << EOF > aws_e2e_setup.json { "iam_auth_ecs_account" : "${iam_auth_ecs_account}", "iam_auth_ecs_secret_access_key" : "${iam_auth_ecs_secret_access_key}", diff --git a/evergreen/external_auth_pip.sh b/evergreen/external_auth_pip.sh index 4a418b834cd..8f1eea5919c 100755 --- a/evergreen/external_auth_pip.sh +++ b/evergreen/external_auth_pip.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" set -o errexit diff --git a/evergreen/failed_unittests_gather.sh b/evergreen/failed_unittests_gather.sh index ebd1e13394a..7e5edf7797b 100644 --- a/evergreen/failed_unittests_gather.sh +++ b/evergreen/failed_unittests_gather.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -14,14 +14,14 @@ unittest_bin_dir=dist-unittests/bin mkdir -p $unittest_bin_dir || true # Find all core files -core_files=$(/usr/bin/find -H . \( -name "dump_*.core" -o -name "*.mdmp" \) 2>/dev/null) +core_files=$(/usr/bin/find -H . \( -name "dump_*.core" -o -name "*.mdmp" \) 2> /dev/null) for core_file in $core_files; do # A core file name does not always have the executable name that generated it. # See http://stackoverflow.com/questions/34801353/core-dump-filename-gets-thread-name-instead-of-executable-name-with-core-pattern # On platforms with GDB, we get the binary name from core file gdb=/opt/mongodbtoolchain/gdb/bin/gdb if [ -f $gdb ]; then - binary_file=$($gdb -batch --quiet -ex "core $core_file" 2>/dev/null | grep "Core was generated" | cut -f2 -d "\`" | cut -f1 -d "'" | cut -f1 -d " ") + binary_file=$($gdb -batch --quiet -ex "core $core_file" 2> /dev/null | grep "Core was generated" | cut -f2 -d "\`" | cut -f1 -d "'" | cut -f1 -d " ") binary_file_locations=$binary_file else # Find the base file name from the core file name, note it may be truncated. @@ -29,7 +29,7 @@ for core_file in $core_files; do binary_file=$(echo "$core_file" | sed "s/.*\///;s/dump_//;s/\..*\.core//;s/\..*\.mdmp//") # Locate the binary file. Since the base file name might be truncated, the find # may return more than 1 file. - binary_file_locations=$(/usr/bin/find -H . -executable -name "$binary_file*${exe}" 2>/dev/null) + binary_file_locations=$(/usr/bin/find -H . -executable -name "$binary_file*${exe}" 2> /dev/null) fi if [ -z "$binary_file_locations" ]; then @@ -70,7 +70,7 @@ has_recorded_failures="" if [[ -f "failed_recorded_tests.txt" ]]; then while read -r line; do cp "$line" . - done <"failed_recorded_tests.txt" + done < "failed_recorded_tests.txt" has_recorded_failures="true" fi diff --git a/evergreen/functions/added_and_modified_patch_files_get.sh b/evergreen/functions/added_and_modified_patch_files_get.sh index 3e07fbf695d..608b53787ef 100755 --- a/evergreen/functions/added_and_modified_patch_files_get.sh +++ b/evergreen/functions/added_and_modified_patch_files_get.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src @@ -6,9 +6,9 @@ cd src set -o verbose set -o errexit -git diff --name-only origin/${branch_name}... --line-prefix="${workdir}/src/" --diff-filter=d >>modified_and_created_patch_files.txt +git diff --name-only origin/${branch_name}... --line-prefix="${workdir}/src/" --diff-filter=d >> modified_and_created_patch_files.txt if [ -d src/mongo/db/modules/enterprise ]; then pushd src/mongo/db/modules/enterprise - git diff HEAD --name-only --line-prefix="${workdir}/src/src/mongo/db/modules/enterprise/" --diff-filter=d >>~1/modified_and_created_patch_files.txt + git diff HEAD --name-only --line-prefix="${workdir}/src/src/mongo/db/modules/enterprise/" --diff-filter=d >> ~1/modified_and_created_patch_files.txt popd fi diff --git a/evergreen/functions/aws_test_credentials_load.sh b/evergreen/functions/aws_test_credentials_load.sh index b2402f5b75b..289c125f9b5 100644 --- a/evergreen/functions/aws_test_credentials_load.sh +++ b/evergreen/functions/aws_test_credentials_load.sh @@ -1,15 +1,15 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src set -o errexit -echo "const AWS_KMS_SECRET_ID = '${aws_kms_access_key_id}';" >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js -echo "const AWS_KMS_SECRET_KEY = '${aws_kms_secret_access_key}';" >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const AWS_KMS_SECRET_ID = '${aws_kms_access_key_id}';" >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const AWS_KMS_SECRET_KEY = '${aws_kms_secret_access_key}';" >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js -echo "const KMS_GCP_EMAIL = '${kms_gcp_email}'; " >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js -echo "const KMS_GCP_PRIVATEKEY = '${kms_gcp_privatekey}'; " >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const KMS_GCP_EMAIL = '${kms_gcp_email}'; " >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const KMS_GCP_PRIVATEKEY = '${kms_gcp_privatekey}'; " >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js -echo "const KMS_AZURE_TENANT_ID = '${kms_azure_tenant_id}';" >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js -echo "const KMS_AZURE_CLIENT_ID = '${kms_azure_client_id}';" >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js -echo "const KMS_AZURE_CLIENT_SECRET = '${kms_azure_client_secret}';" >>src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const KMS_AZURE_TENANT_ID = '${kms_azure_tenant_id}';" >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const KMS_AZURE_CLIENT_ID = '${kms_azure_client_id}';" >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js +echo "const KMS_AZURE_CLIENT_SECRET = '${kms_azure_client_secret}';" >> src/mongo/db/modules/enterprise/jstests/fle/lib/aws_secrets.js diff --git a/evergreen/functions/bf_suggestion_service_call.sh b/evergreen/functions/bf_suggestion_service_call.sh index d022bf38cf7..ebc3004a6c4 100755 --- a/evergreen/functions/bf_suggestion_service_call.sh +++ b/evergreen/functions/bf_suggestion_service_call.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src @@ -17,6 +17,6 @@ if [ -f $report_file ] && grep -Eq "\"failures\": [1-9]" $report_file; then --silent \ --show-error \ --config - \ - https://bfsuggestion.corp.mongodb.com/tasks <<<$user_option + https://bfsuggestion.corp.mongodb.com/tasks <<< $user_option echo "Request to BF Suggestion service status: $?" fi diff --git a/evergreen/functions/binaries_extract.sh b/evergreen/functions/binaries_extract.sh index efa7089ec3f..ec7b8dd3f8f 100755 --- a/evergreen/functions/binaries_extract.sh +++ b/evergreen/functions/binaries_extract.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/functions/binary_version_check.sh b/evergreen/functions/binary_version_check.sh index f5f1a74487c..ac01374a07e 100755 --- a/evergreen/functions/binary_version_check.sh +++ b/evergreen/functions/binary_version_check.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/functions/compile_expansions_generate.sh b/evergreen/functions/compile_expansions_generate.sh index f812173f397..dc9642f5cd4 100644 --- a/evergreen/functions/compile_expansions_generate.sh +++ b/evergreen/functions/compile_expansions_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src @@ -31,7 +31,7 @@ if [ ! -z ${scons_cache_scope} ]; then if [ "Windows_NT" = "$OS" ]; then ./win_mount.sh else - mount | grep "\/efs" >/dev/null + mount | grep "\/efs" > /dev/null if [ $? -eq 0 ]; then echo "Shared cache is already mounted" else diff --git a/evergreen/functions/credentials_setup.sh b/evergreen/functions/credentials_setup.sh index 4f0605a45bf..15be8ea1e66 100755 --- a/evergreen/functions/credentials_setup.sh +++ b/evergreen/functions/credentials_setup.sh @@ -1,9 +1,9 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src -cat >mci.buildlogger <<END_OF_CREDS +cat > mci.buildlogger << END_OF_CREDS slavename='${slave}' passwd='${passwd}' builder='MCI_${build_variant}' diff --git a/evergreen/functions/evergreen_api_credentials_configure.sh b/evergreen/functions/evergreen_api_credentials_configure.sh index c42f637a2c9..78943d01682 100755 --- a/evergreen/functions/evergreen_api_credentials_configure.sh +++ b/evergreen/functions/evergreen_api_credentials_configure.sh @@ -1,10 +1,10 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src # Create the Evergreen API credentials -cat >.evergreen.yml <<END_OF_CREDS +cat > .evergreen.yml << END_OF_CREDS api_server_host: https://evergreen.mongodb.com/api api_key: "${evergreen_api_key}" user: "${evergreen_api_user}" diff --git a/evergreen/functions/files_remove.sh b/evergreen/functions/files_remove.sh index a2c905cdedd..db3631942d7 100755 --- a/evergreen/functions/files_remove.sh +++ b/evergreen/functions/files_remove.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" if [ -z "${files}" ]; then diff --git a/evergreen/functions/modified_patch_files_get_all.sh b/evergreen/functions/modified_patch_files_get_all.sh index 5e79cc6ce0d..1789d65bdb2 100755 --- a/evergreen/functions/modified_patch_files_get_all.sh +++ b/evergreen/functions/modified_patch_files_get_all.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src @@ -9,11 +9,11 @@ set -o errexit # For patch builds gather the modified patch files. if [ "${is_patch}" = "true" ]; then # Get list of patched files - git diff HEAD --name-only >>patch_files.txt + git diff HEAD --name-only >> patch_files.txt if [ -d src/mongo/db/modules/enterprise ]; then pushd src/mongo/db/modules/enterprise # Update the patch_files.txt in the mongo repo. - git diff HEAD --name-only >>~1/patch_files.txt + git diff HEAD --name-only >> ~1/patch_files.txt popd fi fi diff --git a/evergreen/functions/notary_client_credentials_setup.sh b/evergreen/functions/notary_client_credentials_setup.sh index a1dab18b8cc..71c08335d73 100755 --- a/evergreen/functions/notary_client_credentials_setup.sh +++ b/evergreen/functions/notary_client_credentials_setup.sh @@ -1,14 +1,14 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src set -o errexit -cat <<EOF >notary_env.sh +cat << EOF > notary_env.sh export NOTARY_TOKEN=${signing_auth_token_50} export BARQUE_USERNAME=${barque_user} export BARQUE_API_KEY=${barque_api_key} EOF -echo "${signing_auth_token_50}" >signing_auth_token +echo "${signing_auth_token_50}" > signing_auth_token diff --git a/evergreen/functions/process_threads_monitor.sh b/evergreen/functions/process_threads_monitor.sh index c28269a1552..10ae24c343d 100755 --- a/evergreen/functions/process_threads_monitor.sh +++ b/evergreen/functions/process_threads_monitor.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" proc_list="(java|lein|mongo|python|_test$|_test\.exe$)" @@ -11,7 +11,7 @@ if [ "Windows_NT" = "$OS" ]; then } get_process_info() { proc_name="" - proc_info=$(wmic process where "ProcessId=\"$1\"" get "Name,ProcessId,ThreadCount" /format:csv 2>/dev/null | grep $1) + proc_info=$(wmic process where "ProcessId=\"$1\"" get "Name,ProcessId,ThreadCount" /format:csv 2> /dev/null | grep $1) if [ ! -z $proc_info ]; then proc_name=$(echo $proc_info | cut -f2 -d ',') proc_threads=$(echo $proc_info | cut -f4 -d ',') diff --git a/evergreen/functions/remote_credentials_setup.sh b/evergreen/functions/remote_credentials_setup.sh index c5547aa2ba8..65f6a244816 100644 --- a/evergreen/functions/remote_credentials_setup.sh +++ b/evergreen/functions/remote_credentials_setup.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" # Since the macros 'private_key_remote' and 'private_key_file' are not always defined @@ -9,7 +9,7 @@ fi if [ ! -z "${private_key_remote}" ] && [ ! -z "${private_key_file}" ]; then mkdir -p ~/.ssh private_key_file=$(eval echo "$private_key_file") - echo -n "${private_key_remote}" >${private_key_file} + echo -n "${private_key_remote}" > ${private_key_file} chmod 0600 ${private_key_file} fi @@ -28,19 +28,19 @@ if [ $aws_profile = "default" ]; then else aws_profile_config="[profile $aws_profile]" fi -cat <<EOF >>~/.aws/config +cat << EOF >> ~/.aws/config $aws_profile_config region = us-east-1 EOF # The profile in the credentials file is specified as [<profile>]. -cat <<EOF >>~/.aws/credentials +cat << EOF >> ~/.aws/credentials [$aws_profile] aws_access_key_id = ${aws_key_remote} aws_secret_access_key = ${aws_secret_remote} EOF -cat <<EOF >~/.boto +cat << EOF > ~/.boto [Boto] https_validate_certificates = False EOF diff --git a/evergreen/functions/resmoke_jobs_determine.sh b/evergreen/functions/resmoke_jobs_determine.sh index 036e8b00154..9703078ee32 100755 --- a/evergreen/functions/resmoke_jobs_determine.sh +++ b/evergreen/functions/resmoke_jobs_determine.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/functions/run_diskstats.sh b/evergreen/functions/run_diskstats.sh index d79141cdb2c..d118f3ae0eb 100755 --- a/evergreen/functions/run_diskstats.sh +++ b/evergreen/functions/run_diskstats.sh @@ -3,20 +3,20 @@ set -o verbose # On Windows we can use typeperf.exe to dump performance counters. if [ "Windows_NT" = "$OS" ]; then - typeperf -qx PhysicalDisk | grep Disk | grep -v _Total >disk_counters.txt + typeperf -qx PhysicalDisk | grep Disk | grep -v _Total > disk_counters.txt typeperf -cf disk_counters.txt -si 5 -o mongo-diskstats # Linux: iostat -t option for timestamp. -elif iostat -tdmx >/dev/null 2>&1; then - iostat -tdmx 5 >mongo-diskstats +elif iostat -tdmx > /dev/null 2>&1; then + iostat -tdmx 5 > mongo-diskstats # OSX: Simulate the iostat timestamp. -elif iostat -d >/dev/null 2>&1; then - iostat -d -w 5 | while IFS= read -r line; do printf '%s %s\n' "$(date +'%m/%d/%Y %H:%M:%S')" "$line" >>mongo-diskstats; done +elif iostat -d > /dev/null 2>&1; then + iostat -d -w 5 | while IFS= read -r line; do printf '%s %s\n' "$(date +'%m/%d/%Y %H:%M:%S')" "$line" >> mongo-diskstats; done # Check if vmstat -t is available. -elif vmstat -td >/dev/null 2>&1; then - vmstat -td 5 >mongo-diskstats +elif vmstat -td > /dev/null 2>&1; then + vmstat -td 5 > mongo-diskstats # Check if vmstat -T d is available. -elif vmstat -T d >/dev/null 2>&1; then - vmstat -T d 5 >mongo-diskstats +elif vmstat -T d > /dev/null 2>&1; then + vmstat -T d 5 > mongo-diskstats else printf "Cannot collect mongo-diskstats on this platform\n" fi diff --git a/evergreen/functions/selected_tests_credentials_configure.sh b/evergreen/functions/selected_tests_credentials_configure.sh index 964cdc128a0..253880c2c85 100755 --- a/evergreen/functions/selected_tests_credentials_configure.sh +++ b/evergreen/functions/selected_tests_credentials_configure.sh @@ -1,10 +1,10 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src # Create the Evergreen API credentials -cat >.selected_tests.yml <<END_OF_CREDS +cat > .selected_tests.yml << END_OF_CREDS url: "https://selected-tests.server-tig.prod.corp.mongodb.com" project: "${project}" auth_user: "${selected_tests_auth_user}" diff --git a/evergreen/functions/shared_scons_cache_pruning.sh b/evergreen/functions/shared_scons_cache_pruning.sh index 87219355a82..379fc75348d 100755 --- a/evergreen/functions/shared_scons_cache_pruning.sh +++ b/evergreen/functions/shared_scons_cache_pruning.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src @@ -15,7 +15,7 @@ if [[ "${project}" == "mongodb-mongo-master" ]]; then if [ "Windows_NT" = "$OS" ]; then ./win_mount.sh else - mount | grep "\/efs" >/dev/null + mount | grep "\/efs" > /dev/null fi if [ $? -eq 0 ]; then echo "Shared cache is already mounted" diff --git a/evergreen/functions/shared_scons_directory_umount.sh b/evergreen/functions/shared_scons_directory_umount.sh index 6d50da0fdae..06d0465161e 100755 --- a/evergreen/functions/shared_scons_directory_umount.sh +++ b/evergreen/functions/shared_scons_directory_umount.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/functions/system_resource_info_collect.sh b/evergreen/functions/system_resource_info_collect.sh index 9b9129e6abf..fd3310822c3 100755 --- a/evergreen/functions/system_resource_info_collect.sh +++ b/evergreen/functions/system_resource_info_collect.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/functions/task_timeout_determine.sh b/evergreen/functions/task_timeout_determine.sh index 7a43e097939..645aedbc302 100644 --- a/evergreen/functions/task_timeout_determine.sh +++ b/evergreen/functions/task_timeout_determine.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/functions/venv_setup.sh b/evergreen/functions/venv_setup.sh index ec86d7bb539..c0e3ef50017 100644 --- a/evergreen/functions/venv_setup.sh +++ b/evergreen/functions/venv_setup.sh @@ -1,7 +1,7 @@ # exit immediately if virtualenv is not found set -o errexit -evergreen_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)/.." +evergreen_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)/.." . "$evergreen_dir/prelude_workdir.sh" . "$evergreen_dir/prelude_python.sh" @@ -53,4 +53,4 @@ if [ $? != 0 ]; then cat install.log exit 1 fi -python -m pip freeze >pip-requirements.txt +python -m pip freeze > pip-requirements.txt diff --git a/evergreen/functions/win_mount_script_setup.sh b/evergreen/functions/win_mount_script_setup.sh index cf574840e9f..fee19f93cb3 100755 --- a/evergreen/functions/win_mount_script_setup.sh +++ b/evergreen/functions/win_mount_script_setup.sh @@ -1,9 +1,9 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src -cat <<EOF >win_mount.sh +cat << EOF > win_mount.sh net use X: '\\\\${win_scons_endpoint}\\share' /USER:"wincache.build.com\\${win_scons_user}" '${win_scons_pass}' EOF chmod +x win_mount.sh diff --git a/evergreen/functions/wiredtiger_develop_use.sh b/evergreen/functions/wiredtiger_develop_use.sh index db913aac939..7aee7ac973d 100755 --- a/evergreen/functions/wiredtiger_develop_use.sh +++ b/evergreen/functions/wiredtiger_develop_use.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/../prelude.sh" cd src diff --git a/evergreen/fuzzer_tasks_generate.sh b/evergreen/fuzzer_tasks_generate.sh index 51a64c38c36..97f1b7024bd 100644 --- a/evergreen/fuzzer_tasks_generate.sh +++ b/evergreen/fuzzer_tasks_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/gather_mongo_coredumps.sh b/evergreen/gather_mongo_coredumps.sh index 1de73f23873..7c596aa836c 100755 --- a/evergreen/gather_mongo_coredumps.sh +++ b/evergreen/gather_mongo_coredumps.sh @@ -1,6 +1,6 @@ cd src # Find all core files and move to src -core_files=$(/usr/bin/find -H .. \( -name "*.core" -o -name "*.mdmp" \) 2>/dev/null) +core_files=$(/usr/bin/find -H .. \( -name "*.core" -o -name "*.mdmp" \) 2> /dev/null) for core_file in $core_files; do base_name=$(echo $core_file | sed "s/.*\///") # Move file if it does not already exist diff --git a/evergreen/gen_feature_flags.sh b/evergreen/gen_feature_flags.sh index 94cb93bb8f0..4e6dc0e9b4c 100755 --- a/evergreen/gen_feature_flags.sh +++ b/evergreen/gen_feature_flags.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/gen_patch_test_tags.sh b/evergreen/gen_patch_test_tags.sh index 67120c050e5..b473cfc2dbc 100644 --- a/evergreen/gen_patch_test_tags.sh +++ b/evergreen/gen_patch_test_tags.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/hang_analyzer.sh b/evergreen/hang_analyzer.sh index 64cdeeb9ffb..104f9b5b30a 100644 --- a/evergreen/hang_analyzer.sh +++ b/evergreen/hang_analyzer.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/idl_tests_run.sh b/evergreen/idl_tests_run.sh index bb6e648cdc1..ec2a8a2f493 100644 --- a/evergreen/idl_tests_run.sh +++ b/evergreen/idl_tests_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/implicit_multiversions_tasks_generate.sh b/evergreen/implicit_multiversions_tasks_generate.sh index b4df4d1105b..11d3426f576 100644 --- a/evergreen/implicit_multiversions_tasks_generate.sh +++ b/evergreen/implicit_multiversions_tasks_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/jepsen_test_fail.sh b/evergreen/jepsen_test_fail.sh index fa8d72d7e43..0544758d66f 100644 --- a/evergreen/jepsen_test_fail.sh +++ b/evergreen/jepsen_test_fail.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/jepsen-mongodb diff --git a/evergreen/jepsen_test_run.sh b/evergreen/jepsen_test_run.sh index 0a888c498cc..2729661d055 100644 --- a/evergreen/jepsen_test_run.sh +++ b/evergreen/jepsen_test_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/jepsen-mongodb @@ -53,10 +53,10 @@ else final_exit_code=1 else # If the failure is due to setup, then this is considered a system failure. - echo $grep_exit_code >jepsen_system_failure_${task_name}_${execution} + echo $grep_exit_code > jepsen_system_failure_${task_name}_${execution} exit 0 fi fi # Create report.json -echo "{\"failures\": $failures, \"results\": [{\"status\": $status, \"exit_code\": $final_exit_code, \"test_file\": \"${task_name}\", \"start\": $start_time, \"end\": $end_time, \"elapsed\": $elapsed_secs}]}" >../report.json +echo "{\"failures\": $failures, \"results\": [{\"status\": $status, \"exit_code\": $final_exit_code, \"test_file\": \"${task_name}\", \"start\": $start_time, \"end\": $end_time, \"elapsed\": $elapsed_secs}]}" > ../report.json exit $final_exit_code diff --git a/evergreen/jstestfuzz_run.sh b/evergreen/jstestfuzz_run.sh index b3281992296..30e6ed36549 100644 --- a/evergreen/jstestfuzz_run.sh +++ b/evergreen/jstestfuzz_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/jstestfuzz diff --git a/evergreen/jstestfuzz_setup.sh b/evergreen/jstestfuzz_setup.sh index b2900f3b121..f0d2b7a4c29 100644 --- a/evergreen/jstestfuzz_setup.sh +++ b/evergreen/jstestfuzz_setup.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/kitchen_run.sh b/evergreen/kitchen_run.sh index 174a36a66ea..de6320fd641 100644 --- a/evergreen/kitchen_run.sh +++ b/evergreen/kitchen_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/buildscripts/package_test diff --git a/evergreen/libdeps_run.sh b/evergreen/libdeps_run.sh index a6e253d5243..1ee9981e3b6 100755 --- a/evergreen/libdeps_run.sh +++ b/evergreen/libdeps_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -8,6 +8,6 @@ set -o verbose activate_venv GRAPH_FILE=$(find build -name "libdeps.graphml") -python buildscripts/libdeps/gacli.py --graph-file $GRAPH_FILE >results.txt +python buildscripts/libdeps/gacli.py --graph-file $GRAPH_FILE > results.txt gzip $GRAPH_FILE mv $GRAPH_FILE.gz . diff --git a/evergreen/libdeps_setup.sh b/evergreen/libdeps_setup.sh index c8b3eee042c..06c9535ef81 100755 --- a/evergreen/libdeps_setup.sh +++ b/evergreen/libdeps_setup.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/lint_fuzzer_sanity_all.sh b/evergreen/lint_fuzzer_sanity_all.sh index 43b3d7305f2..16ae53b923c 100644 --- a/evergreen/lint_fuzzer_sanity_all.sh +++ b/evergreen/lint_fuzzer_sanity_all.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/lint_fuzzer_sanity_patch.sh b/evergreen/lint_fuzzer_sanity_patch.sh index de63ff2e5e7..11196aff1ea 100644 --- a/evergreen/lint_fuzzer_sanity_patch.sh +++ b/evergreen/lint_fuzzer_sanity_patch.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/lint_yaml.sh b/evergreen/lint_yaml.sh index 79b7ace6f99..73356b0a778 100755 --- a/evergreen/lint_yaml.sh +++ b/evergreen/lint_yaml.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/local_client_logs_tar.sh b/evergreen/local_client_logs_tar.sh index 21c01ba79b3..dc8dc391c46 100644 --- a/evergreen/local_client_logs_tar.sh +++ b/evergreen/local_client_logs_tar.sh @@ -1,9 +1,9 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src -client_logs=$(ls crud*.log fsm*.log 2>/dev/null) +client_logs=$(ls crud*.log fsm*.log 2> /dev/null) if [ ! -z "$client_logs" ]; then ${tar} czf client-logs.tgz $client_logs fi diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh index 2c90d8b85cb..9fd7cea1984 100644 --- a/evergreen/multiversion_setup.sh +++ b/evergreen/multiversion_setup.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/ninja_compile.sh b/evergreen/ninja_compile.sh index 6d11d5607c8..eea669343fe 100644 --- a/evergreen/ninja_compile.sh +++ b/evergreen/ninja_compile.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -9,8 +9,8 @@ activate_venv python -m pip install ninja if [ "Windows_NT" = "$OS" ]; then vcvars="$(vswhere -latest -property installationPath | tr '\\' '/' | dos2unix.exe)/VC/Auxiliary/Build/" - echo "call \"$vcvars/vcvarsall.bat\" amd64" >msvc.bat - echo "ninja install-core" >>msvc.bat + echo "call \"$vcvars/vcvarsall.bat\" amd64" > msvc.bat + echo "ninja install-core" >> msvc.bat cmd /C msvc.bat else ninja install-core diff --git a/evergreen/notary_client_run.sh b/evergreen/notary_client_run.sh index c0be84b8dbd..2ffd3ffeee3 100644 --- a/evergreen/notary_client_run.sh +++ b/evergreen/notary_client_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/package.sh b/evergreen/package.sh index eb3dcd6f9fe..007dea3f09c 100755 --- a/evergreen/package.sh +++ b/evergreen/package.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/packager.py_run.sh b/evergreen/packager.py_run.sh index da965c21372..748893ffa6c 100644 --- a/evergreen/packager.py_run.sh +++ b/evergreen/packager.py_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/packages_publish.sh b/evergreen/packages_publish.sh index b00b43022f1..960bc3e0a92 100644 --- a/evergreen/packages_publish.sh +++ b/evergreen/packages_publish.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/powercycle_check_host.sh b/evergreen/powercycle_check_host.sh index a62937a6d98..c0ad01890a4 100644 --- a/evergreen/powercycle_check_host.sh +++ b/evergreen/powercycle_check_host.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" if [ "Windows_NT" = "$OS" ]; then @@ -6,10 +6,10 @@ if [ "Windows_NT" = "$OS" ]; then else user=$USER fi -hostname=$(tr -d '"[]{}' <src/hosts.yml | cut -d , -f 1 | awk -F : '{print $2}') +hostname=$(tr -d '"[]{}' < src/hosts.yml | cut -d , -f 1 | awk -F : '{print $2}') # To add the hostname to expansions. -echo "private_ip_address: $hostname" >>src/powercycle_ip_address.yml +echo "private_ip_address: $hostname" >> src/powercycle_ip_address.yml echo $hostname echo $user @@ -25,7 +25,7 @@ while ! ssh \ -o IdentitiesOnly=yes \ -o StrictHostKeyChecking=no \ "$(printf "%s@%s" "$user" "$hostname")" \ - exit 2>/dev/null; do + exit 2> /dev/null; do [ "$attempts" -ge "$connection_attempts" ] && exit 1 ((attempts++)) printf "SSH connection attempt %d/%d failed. Retrying...\n" "$attempts" "$connection_attempts" diff --git a/evergreen/powercycle_exit.sh b/evergreen/powercycle_exit.sh index 8b119c0661a..44847473282 100644 --- a/evergreen/powercycle_exit.sh +++ b/evergreen/powercycle_exit.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" # Test exits from here with specified exit_code. diff --git a/evergreen/powercycle_run_test.sh b/evergreen/powercycle_run_test.sh index a0703faa161..4d82ea0ef7d 100644 --- a/evergreen/powercycle_run_test.sh +++ b/evergreen/powercycle_run_test.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/powercycle_save_artifacts.sh b/evergreen/powercycle_save_artifacts.sh index a4e3490ee7b..615fab1c7fe 100644 --- a/evergreen/powercycle_save_artifacts.sh +++ b/evergreen/powercycle_save_artifacts.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/powercycle_sentinel_run.sh b/evergreen/powercycle_sentinel_run.sh index f36f94dda1d..861f2662239 100755 --- a/evergreen/powercycle_sentinel_run.sh +++ b/evergreen/powercycle_sentinel_run.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/powercycle_setup_host.sh b/evergreen/powercycle_setup_host.sh index 4bf0e9bdc8c..31c6042fb84 100644 --- a/evergreen/powercycle_setup_host.sh +++ b/evergreen/powercycle_setup_host.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/powercycle_ssh_failure_exit.sh b/evergreen/powercycle_ssh_failure_exit.sh index a9954721fc3..fa0d824239e 100644 --- a/evergreen/powercycle_ssh_failure_exit.sh +++ b/evergreen/powercycle_ssh_failure_exit.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/powercycle_tasks_generate.sh b/evergreen/powercycle_tasks_generate.sh index 15b7555790e..ddfc54c4bf6 100755 --- a/evergreen/powercycle_tasks_generate.sh +++ b/evergreen/powercycle_tasks_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/prelude.sh b/evergreen/prelude.sh index 81bacd45325..abb0c6bce83 100755 --- a/evergreen/prelude.sh +++ b/evergreen/prelude.sh @@ -5,7 +5,7 @@ fi set -o errexit # path the directory that contains this script. -evergreen_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +evergreen_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$evergreen_dir/prelude_workdir.sh" . "$evergreen_dir/prelude_python.sh" @@ -20,7 +20,7 @@ if [ "Windows_NT" = "$OS" ]; then script=$(cygpath -w "$script") fi -eval $(activate_venv >/dev/null && $python "$script" "$expansions_yaml" "$expansions_default_yaml") +eval $(activate_venv > /dev/null && $python "$script" "$expansions_yaml" "$expansions_default_yaml") if [ -n "$___expansions_error" ]; then echo $___expansions_error exit 1 @@ -54,7 +54,7 @@ function posix_workdir { } function set_sudo { - set -o >/tmp/settings.log + set -o > /tmp/settings.log set +o errexit grep errexit /tmp/settings.log | grep on errexit_on=$? @@ -62,7 +62,7 @@ function set_sudo { set +o errexit sudo= # Use sudo, if it is supported. - sudo date >/dev/null 2>&1 + sudo date > /dev/null 2>&1 if [ $? -eq 0 ]; then sudo=sudo fi diff --git a/evergreen/prelude_python.sh b/evergreen/prelude_python.sh index 278492f7947..304cfa49bb1 100644 --- a/evergreen/prelude_python.sh +++ b/evergreen/prelude_python.sh @@ -4,10 +4,10 @@ else if [ -f /opt/mongodbtoolchain/v3/bin/python3 ]; then python="/opt/mongodbtoolchain/v3/bin/python3" elif [ -f "$(which python3)" ]; then - echo "Could not find mongodbtoolchain python, using system python $(which python3)" >2 + echo "Could not find mongodbtoolchain python, using system python $(which python3)" > 2 python=$(which python3) else - echo "Could not find python3." >2 + echo "Could not find python3." > 2 return 1 fi fi diff --git a/evergreen/prelude_venv.sh b/evergreen/prelude_venv.sh index d4b65895b1c..6b97a8a9cfb 100644 --- a/evergreen/prelude_venv.sh +++ b/evergreen/prelude_venv.sh @@ -3,9 +3,9 @@ function activate_venv { if [ -d "${workdir}/venv" ]; then if [ "Windows_NT" = "$OS" ]; then # Need to quote the path on Windows to preserve the separator. - . "${workdir}/venv/Scripts/activate" 2>/tmp/activate_error.log + . "${workdir}/venv/Scripts/activate" 2> /tmp/activate_error.log else - . ${workdir}/venv/bin/activate 2>/tmp/activate_error.log + . ${workdir}/venv/bin/activate 2> /tmp/activate_error.log fi if [ $? -ne 0 ]; then echo "Failed to activate virtualenv: $(cat /tmp/activate_error.log)" diff --git a/evergreen/randomized_multiversion_tasks_generate.sh b/evergreen/randomized_multiversion_tasks_generate.sh index 44eba5e8685..f9e34b61bad 100644 --- a/evergreen/randomized_multiversion_tasks_generate.sh +++ b/evergreen/randomized_multiversion_tasks_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/randomized_multiversion_tasks_generate_exclude_tags.sh b/evergreen/randomized_multiversion_tasks_generate_exclude_tags.sh index 77524a187b4..d1ca561083a 100644 --- a/evergreen/randomized_multiversion_tasks_generate_exclude_tags.sh +++ b/evergreen/randomized_multiversion_tasks_generate_exclude_tags.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/resmoke_tasks_generate.sh b/evergreen/resmoke_tasks_generate.sh index 7ca1245b4b7..c4c7f64b0ad 100644 --- a/evergreen/resmoke_tasks_generate.sh +++ b/evergreen/resmoke_tasks_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" if [ -n "$GENERATE_BUILD_VARIANTS" ]; then diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index 99daa890f0d..042cc226f81 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -26,7 +26,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then tags_build_variant="enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required" fi - $python buildscripts/testmatrix/getdisplaytaskname.py "${task_name}" "${build_variant}" >display_task_name.txt + $python buildscripts/testmatrix/getdisplaytaskname.py "${task_name}" "${build_variant}" > display_task_name.txt display_task_name=$(cat display_task_name.txt) tar -xzf patch_test_tags.tgz @@ -62,7 +62,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then if [ -f /proc/self/coredump_filter ]; then # Set the shell process (and its children processes) to dump ELF headers (bit 4), # anonymous shared mappings (bit 1), and anonymous private mappings (bit 0). - echo 0x13 >/proc/self/coredump_filter + echo 0x13 > /proc/self/coredump_filter if [ -f /sbin/sysctl ]; then # Check that the core pattern is set explicitly on our distro image instead @@ -170,14 +170,14 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then # 75 is exit code resmoke.py uses when the log output would be incomplete due to failing # to communicate with logkeeper. if [[ $resmoke_exit_code = 74 || $resmoke_exit_code = 75 ]]; then - echo $resmoke_exit_code >run_tests_infrastructure_failure + echo $resmoke_exit_code > run_tests_infrastructure_failure exit 0 elif [ $resmoke_exit_code != 0 ]; then # On failure save the resmoke exit code. - echo $resmoke_exit_code >resmoke_error_code + echo $resmoke_exit_code > resmoke_error_code elif [ $resmoke_exit_code = 0 ]; then # On success delete core files. - core_files=$(/usr/bin/find -H .. \( -name "*.core" -o -name "*.mdmp" \) 2>/dev/null) + core_files=$(/usr/bin/find -H .. \( -name "*.core" -o -name "*.mdmp" \) 2> /dev/null) rm -rf $core_files fi diff --git a/evergreen/scons_compile.sh b/evergreen/scons_compile.sh index b274fdea96c..dc5d429f0b3 100755 --- a/evergreen/scons_compile.sh +++ b/evergreen/scons_compile.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/scons_lint.sh b/evergreen/scons_lint.sh index 463bc832e21..1cdf6ad9bf9 100755 --- a/evergreen/scons_lint.sh +++ b/evergreen/scons_lint.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -8,7 +8,7 @@ set -o verbose activate_venv export MYPY="$( - if which cygpath 2>/dev/null; then + if which cygpath 2> /dev/null; then PATH+=":$(cypath "${workdir}")/venv_3/Scripts" else PATH+=":${workdir}/venv_3/bin" diff --git a/evergreen/scons_splunk.sh b/evergreen/scons_splunk.sh index bf77d96f2e6..a8fdd9f937d 100644 --- a/evergreen/scons_splunk.sh +++ b/evergreen/scons_splunk.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" -curator --level warning splunk --json --url=${scons_splunk_server} --token=${scons_splunk_token} --annotation=project:${project} --annotation=task_id:${task_id} --annotation=build_variant:${build_variant} --annotation=git_revision:${revision} pipe <src/scons_cache.log.json +curator --level warning splunk --json --url=${scons_splunk_server} --token=${scons_splunk_token} --annotation=project:${project} --annotation=task_id:${task_id} --annotation=build_variant:${build_variant} --annotation=git_revision:${revision} pipe < src/scons_cache.log.json diff --git a/evergreen/selected_tests_generate.sh b/evergreen/selected_tests_generate.sh index d01626efdbe..ba268b1d5d2 100644 --- a/evergreen/selected_tests_generate.sh +++ b/evergreen/selected_tests_generate.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/stitch_support_create_lib_tar.sh b/evergreen/stitch_support_create_lib_tar.sh index 9f45b50d8ae..e5ddb1e2524 100755 --- a/evergreen/stitch_support_create_lib_tar.sh +++ b/evergreen/stitch_support_create_lib_tar.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src/build diff --git a/evergreen/stitch_support_run_tests.sh b/evergreen/stitch_support_run_tests.sh index 85466872960..d7b69d01679 100755 --- a/evergreen/stitch_support_run_tests.sh +++ b/evergreen/stitch_support_run_tests.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/todos_check.sh b/evergreen/todos_check.sh index 44ec7837219..7fc97f063f3 100644 --- a/evergreen/todos_check.sh +++ b/evergreen/todos_check.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src @@ -12,7 +12,7 @@ set -o errexit # properly deal with any special characters that could cause issues (like "). To # do this, we will write it out to a file, then read that file into a variable. if [ "${is_commit_queue}" = "true" ]; then - cat >commit_message.txt <<END_OF_COMMIT_MSG + cat > commit_message.txt << END_OF_COMMIT_MSG ${commit_message} END_OF_COMMIT_MSG diff --git a/evergreen/undo_wiki_page.sh b/evergreen/undo_wiki_page.sh index 91855244e95..5c27b0c7904 100644 --- a/evergreen/undo_wiki_page.sh +++ b/evergreen/undo_wiki_page.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" set -o errexit @@ -10,4 +10,4 @@ $python -c 'import json; print(json.dumps([{ "link": "https://wiki.corp.mongodb.com/display/COREENG/Time+Travel+Debugging+in+MongoDB", "visibility": "public", "ignore_for_fetch": True -}]))' >undo_wiki_page_location.json +}]))' > undo_wiki_page_location.json diff --git a/evergreen/update_patch_failure_history.sh b/evergreen/update_patch_failure_history.sh index 34a622c6a29..774a49433cd 100644 --- a/evergreen/update_patch_failure_history.sh +++ b/evergreen/update_patch_failure_history.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src diff --git a/evergreen/wiki_page.sh b/evergreen/wiki_page.sh index 6e9fd6317ba..fdf9ed27fde 100644 --- a/evergreen/wiki_page.sh +++ b/evergreen/wiki_page.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" set -o errexit @@ -10,4 +10,4 @@ $python -c 'import json; print(json.dumps([{ "link": "https://github.com/mongodb/mongo/wiki/Running-Tests-from-Evergreen-Tasks-Locally", "visibility": "public", "ignore_for_fetch": True -}]))' >wiki_page_location.json +}]))' > wiki_page_location.json |