Skip to content

Commit 7727491

Browse files
committed
Don't use sh to invoke shell scripts
Invoking shell scripts using sh instead of relying on the shebang causes problems now that drivers-evergreen-tools assumes bash for most of its scripts.
1 parent a944067 commit 7727491

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.evergreen/config/functions.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ functions:
141141
params:
142142
script: |
143143
${PREPARE_SHELL}
144-
SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
144+
SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
145145
# run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH
146146
- command: expansions.update
147147
params:
@@ -152,18 +152,18 @@ functions:
152152
params:
153153
script: |
154154
${PREPARE_SHELL}
155-
sh ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
155+
${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
156156
157157
"bootstrap mongohoused":
158158
- command: shell.exec
159159
params:
160160
script: |
161-
VARIANT=${VARIANT} DRIVERS_TOOLS="${DRIVERS_TOOLS}" sh ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
161+
VARIANT=${VARIANT} DRIVERS_TOOLS="${DRIVERS_TOOLS}" ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
162162
- command: shell.exec
163163
params:
164164
background: true
165165
script: |
166-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" sh ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
166+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
167167
168168
"create serverless instance":
169169
- command: shell.exec
@@ -272,7 +272,7 @@ functions:
272272
PHP_VERSION=${PHP_VERSION} \
273273
SSL=${SSL} \
274274
TESTS=${TESTS} \
275-
sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
275+
${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
276276
277277
"run atlas data lake test":
278278
- command: shell.exec
@@ -285,7 +285,7 @@ functions:
285285
286286
MONGODB_URI="mongodb://mhuser:pencil@127.0.0.1:27017" \
287287
TESTS="atlas-data-lake" \
288-
sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
288+
${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
289289
290290
"run serverless tests":
291291
- command: shell.exec
@@ -318,7 +318,7 @@ functions:
318318
CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
319319
MONGODB_URI="${SERVERLESS_URI}" \
320320
TESTS="serverless" \
321-
sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
321+
${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
322322
323323
"cleanup":
324324
- command: shell.exec

0 commit comments

Comments
 (0)