Revert "Evergreen: Fix sourcing javaConfig.bash"

jyemin · jyemin · commit 9d5e581e639b · 2021-11-11T12:01:14.000-05:00
This reverts commit 59dc792.
diff --git a/.evergreen/compile.sh b/.evergreen/compile.sh
@@ -6,8 +6,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Compiling java driver"
 
diff --git a/.evergreen/publish.sh b/.evergreen/publish.sh
@@ -7,8 +7,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 RELEASE=${RELEASE:false}
 
diff --git a/.evergreen/run-atlas-data-lake-test.sh b/.evergreen/run-atlas-data-lake-test.sh
@@ -10,8 +10,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running Atlas Data Lake driver tests"
 
diff --git a/.evergreen/run-connectivity-tests.sh b/.evergreen/run-connectivity-tests.sh
@@ -12,8 +12,7 @@ set -o errexit
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running connectivity tests with Java ${JAVA_VERSION}"
 
diff --git a/.evergreen/run-gssapi-auth-test.sh b/.evergreen/run-gssapi-auth-test.sh
@@ -15,8 +15,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running GSSAPI authentication tests"
 
diff --git a/.evergreen/run-kms-tls-tests.sh b/.evergreen/run-kms-tls-tests.sh
@@ -10,8 +10,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 echo "Running KMS TLS tests"
 
 cp ${JAVA_HOME}/lib/security/cacerts mongo-truststore
diff --git a/.evergreen/run-load-balancer-tests.sh b/.evergreen/run-load-balancer-tests.sh
@@ -17,8 +17,7 @@ MONGODB_URI=${MONGODB_URI:-}
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 if [ "$SSL" != "nossl" ]; then
   # We generate the keystore and truststore on every run with the certs in the drivers-tools repo
diff --git a/.evergreen/run-mmapv1-storage-test.sh b/.evergreen/run-mmapv1-storage-test.sh
@@ -10,8 +10,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running MMAPv1 Storage Test"
 
diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh
@@ -12,8 +12,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 if [[ -z "$1" ]]; then
     echo "usage: $0 <MONGODB_URI>"
diff --git a/.evergreen/run-mongodb-aws-test.sh b/.evergreen/run-mongodb-aws-test.sh
@@ -10,8 +10,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running MONGODB-AWS authentication tests"
 
diff --git a/.evergreen/run-ocsp-test.sh b/.evergreen/run-ocsp-test.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -o xtrace
 set -o errexit  # Exit the script with error if any of the commands fail
@@ -9,8 +9,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 
 OCSP_MUST_STAPLE=${OCSP_MUST_STAPLE:-}
 OCSP_TLS_SHOULD_SUCCEED=${OCSP_TLS_SHOULD_SUCCEED:-}
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 ############################################
 #            Functions                     #
diff --git a/.evergreen/run-perf-tests.sh b/.evergreen/run-perf-tests.sh
@@ -11,8 +11,7 @@ tar xf parallel.tgz
 tar xf single_and_multi_document.tgz
 cd ..
 
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 export TEST_PATH="${PROJECT_DIRECTORY}/driver-performance-test-data/"
 export OUTPUT_FILE="${PROJECT_DIRECTORY}/results.json"
diff --git a/.evergreen/run-plain-auth-test.sh b/.evergreen/run-plain-auth-test.sh
@@ -12,8 +12,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running PLAIN authentication tests"
 
diff --git a/.evergreen/run-reactive-streams-tck-tests.sh b/.evergreen/run-reactive-streams-tck-tests.sh
@@ -6,8 +6,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running Reactive Streams TCK tests with Java ${JAVA_VERSION}"
 
diff --git a/.evergreen/run-scala-tests.sh b/.evergreen/run-scala-tests.sh
@@ -13,8 +13,7 @@ SAFE_FOR_MULTI_MONGOS=${SAFE_FOR_MULTI_MONGOS:-}
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 
 if [ "$SSL" != "nossl" ]; then
diff --git a/.evergreen/run-serverless-tests.sh b/.evergreen/run-serverless-tests.sh
@@ -14,7 +14,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 echo "Running serverless tests with Java ${JAVA_VERSION}"
 
diff --git a/.evergreen/run-socket-tests.sh b/.evergreen/run-socket-tests.sh
@@ -20,8 +20,7 @@ COMPRESSOR=${COMPRESSOR:-}
 ############################################
 #            Main Program                  #
 ############################################
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 SOCKET_REGEX='(.*)localhost:([0-9]+)?(.*)'
 while [[ $MONGODB_URI =~ $SOCKET_REGEX ]]; do
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -39,8 +39,7 @@ if [ "${SSL}" = "ssl" ] && [ "${STREAM_TYPE}" = "netty" ] && [ "${NETTY_SSL_PROV
   readonly JAVA_SYSPROP_NETTY_SSL_PROVIDER="-Dorg.mongodb.test.netty.ssl.provider=${NETTY_SSL_PROVIDER}"
 fi
 
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${BASH_SOURCE%/*}/javaConfig.bash"
 
 ############################################
 #            Functions                     #
