clean up path handling

Author: blink1073

.evergreen/scripts/configure-env.sh

@@ -18,7 +18,15 @@ UV_TOOL_DIR=$PROJECT_DIRECTORY/.local/uv/tools
 UV_CACHE_DIR=$PROJECT_DIRECTORY/.local/uv/cache
 DRIVERS_TOOLS_BINARIES="$DRIVERS_TOOLS/.bin"
 MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
-PATH="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PATH"
+
+# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
+if [ "${CI:-}" == "true" ]; then
+  PYMONGO_BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
+elif [ "Windows_NT" = "${OS:-}" ]; then
+  PYMONGO_BIN_DIR=$HOME/cli_bin
+else
+  PYMONGO_BIN_DIR=""
+fi
 
 # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
 if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
@@ -27,6 +35,7 @@ if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
     CARGO_HOME=$(cygpath -m $CARGO_HOME)
     UV_TOOL_DIR=$(cygpath -m "$UV_TOOL_DIR")
     UV_CACHE_DIR=$(cygpath -m "$UV_CACHE_DIR")
+    PYMONGO_BIN_DIR=$(cygpath -m $PYMONGO_BIN_DIR)
 fi
 
 SCRIPT_DIR="$PROJECT_DIRECTORY/.evergreen/scripts"
@@ -38,6 +47,7 @@ if [ -f "$SCRIPT_DIR/env.sh" ]; then
 fi
 
 MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
+PATH="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PYMONGO_BIN_DIR:$PATH"
 
 cat <<EOT > "$SCRIPT_DIR"/env.sh
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"

.evergreen/scripts/install-dependencies.sh

@@ -2,17 +2,7 @@
 
 set -eu
 
-# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
-if [ "${CI:-}" == "true" ]; then
-  echo "REALLY? $DRIVERS_TOOLS_BINARIES"
-  _BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
-elif [ "Windows_NT" = "${OS:-}" ]; then
-  _BIN_DIR=$HOME/cli_bin
-else
-  _BIN_DIR=$HOME/.local/bin
-fi
-export PATH="$PATH:$_BIN_DIR"
-
+_BIN_DIR=${PYMONGO_BIN_DIR:-}
 
 # Helper function to pip install a dependency using a temporary python env.
 function _pip_install() {
@@ -29,6 +19,10 @@ function _pip_install() {
 
 # Ensure just is installed.
 if ! command -v just 2>/dev/null; then
+  if [ -z "${_BIN_DIR}" ]; then
+    echo "Please install just!"
+    exit 1
+  fi
   # On most systems we can install directly.
   _TARGET=""
   if [ "Windows_NT" = "${OS:-}" ]; then
@@ -44,6 +38,10 @@ fi
 
 # Install uv.
 if ! command -v uv 2>/dev/null; then
+  if [ -z "${_BIN_DIR}" ]; then
+    echo "Please install uv!"
+    exit 1
+  fi
   echo "Installing uv..."
   # On most systems we can install directly.
   curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {

.evergreen/scripts/setup-dev-env.sh

@@ -17,7 +17,6 @@ fi
 # Ensure dependencies are installed.
 . $HERE/install-dependencies.sh
 
-
 # Set the location of the python bin dir.
 if [ "Windows_NT" = "${OS:-}" ]; then
   BIN_DIR=.venv/Scripts