From 43007f5f22e6647842d763b4bd8a3cc20c883a90 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 17 Nov 2025 14:13:18 -0600 Subject: [PATCH] Avoid EVG vs. Bash variable expansion confusion --- .evergreen/generated_configs/legacy-config.yml | 4 ++-- .../legacy_config_generator/evergreen_config_lib/functions.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.evergreen/generated_configs/legacy-config.yml b/.evergreen/generated_configs/legacy-config.yml index f210443914..0120d3df37 100644 --- a/.evergreen/generated_configs/legacy-config.yml +++ b/.evergreen/generated_configs/legacy-config.yml @@ -139,7 +139,7 @@ functions: set -o errexit # Build libmongoc with CMake and compile a program that links # dynamically to it, using variables from pkg-config.exe. - PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:${PATH:-}" # mingw-w64 GCC + PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:$PATH" # mingw-w64 GCC cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw.cmd link sample program MSVC bson: - command: shell.exec @@ -166,7 +166,7 @@ functions: set -o errexit # Build libmongoc with CMake and compile a program that links # dynamically to it, using variables from pkg-config.exe. - PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:${PATH:-}" # mingw-w64 GCC + PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:$PATH" # mingw-w64 GCC cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw-bson.cmd update codecov.io: - command: shell.exec diff --git a/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py b/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py index 3781232c08..93d23177c2 100644 --- a/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py +++ b/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py @@ -157,7 +157,7 @@ r""" # Build libmongoc with CMake and compile a program that links # dynamically to it, using variables from pkg-config.exe. - PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:${PATH:-}" # mingw-w64 GCC + PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:$PATH" # mingw-w64 GCC cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw.cmd """, ) @@ -186,7 +186,7 @@ r""" # Build libmongoc with CMake and compile a program that links # dynamically to it, using variables from pkg-config.exe. - PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:${PATH:-}" # mingw-w64 GCC + PATH="/cygdrive/c/ProgramData/chocolatey/lib/winlibs/tools/mingw64/bin:$PATH" # mingw-w64 GCC cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw-bson.cmd """, )