clean up handling of binaries

Author: blink1073

.evergreen/just.sh

@@ -2,4 +2,4 @@
 set -eu
 
 . .evergreen/scripts/setup-dev-env.sh
-just "$@"
+${JUST_BINARY:-just} "$@"

.evergreen/run-tests.sh

@@ -25,8 +25,7 @@ else
   exit 1
 fi
 
-. $ROOT/.evergreen/utils.sh
-UV=$(get_uv)
+UV=${UV_BINARY:-uv}
 
 # List the packages.
 $UV sync ${UV_ARGS} --reinstall

.evergreen/scripts/configure-env.sh

@@ -91,23 +91,5 @@ DRIVERS_TOOLS: "$DRIVERS_TOOLS"
 PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
 EOT
 
-# If the toolchain is available, symlink binaries to the bin dir.  This has to be done
-# after drivers-tools is cloned, since we might be using its binary dir.
-_bin_path=""
-if [ "Windows_NT" == "${OS:-}" ]; then
-  _bin_path="/cygdrive/c/Python/Current/Scripts"
-elif [ "$(uname -s)" != "Darwin" ]; then
-  _bin_path="/Library/Frameworks/Python.Framework/Versions/Current/bin"
-else
-  _bin_path="/opt/python/Current/bin"
-fi
-if [ -d "${_bin_path}" ]; then
-  _suffix=""
-  if [ "Windows_NT" == "${OS:-}" ]; then
-    _suffix=".exe"
-  fi
-  mkdir -p $PYMONGO_BIN_DIR
-  ln -s ${_bin_path}/just${_suffix} $PYMONGO_BIN_DIR/just${_suffix}
-  ln -s ${_bin_path}/uv${_suffix} $PYMONGO_BIN_DIR/uv${_suffix}
-  ln -s ${_bin_path}/uvx${_suffix} $PYMONGO_BIN_DIR/uvx${_suffix}
-fi
+# Handle the binary dependencies.
+bash $SCRIPT_DIR/install-dependencies.sh

.evergreen/scripts/install-dependencies.sh

@@ -82,4 +82,8 @@ if ! command -v uv >/dev/null 2>&1; then
   echo "Installing uv... done."
 fi
 
+# Write the binary locations to the env file.
+echo "UV_BINARY=$(which uv)" >> $HERE/env.sh
+echo "JUST_BINARY=$(which uv)" >> $HERE/env.sh
+
 popd > /dev/null

.evergreen/scripts/run-server.sh

@@ -10,7 +10,5 @@ if [ -f $HERE/env.sh ]; then
   source $HERE/env.sh
 fi
 
-. $ROOT/.evergreen/utils.sh
-UV=$(get_uv)
-
+UV=${UV_BINARY:-uv}
 $UV run $HERE/run_server.py "$@"

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

@@ -17,7 +17,8 @@ if [ -f $HERE/test-env.sh ]; then
 fi
 
 # Ensure dependencies are installed.
-bash $HERE/install-dependencies.sh
+export JUST
+JUST=$($HERE/install-dependencies.sh)
 
 # Get the appropriate UV_PYTHON.
 . $ROOT/.evergreen/utils.sh

.evergreen/scripts/setup-system.sh

@@ -8,7 +8,6 @@ echo "Setting up system..."
 bash .evergreen/scripts/configure-env.sh
 source .evergreen/scripts/env.sh
 bash $DRIVERS_TOOLS/.evergreen/setup.sh
-bash .evergreen/scripts/install-dependencies.sh
 popd
 
 # Enable core dumps if enabled on the machine

.evergreen/scripts/setup-tests.sh

@@ -20,7 +20,5 @@ if [ -f $SCRIPT_DIR/env.sh ]; then
   source $SCRIPT_DIR/env.sh
 fi
 
-. $ROOT/.evergreen/utils.sh
-UV=$(get_uv)
-
+UV=${UV_BINARY:-uv}
 $UV run $SCRIPT_DIR/setup_tests.py "$@"

.evergreen/utils.sh

@@ -138,22 +138,3 @@ get_python_binary() {
         return 1
     fi
 }
-
-
-# Get the appropriate uv binary.
-get_uv() {
-    # Try to use the binaries in the toolchain if available.
-    if [ -f "/cygdrive/c/Python/Current/Scripts/uv.exe" ]; then
-        echo "/cygdrive/c/Python/Current/Scripts/uv.exe"
-        return
-    fi
-    if [ -f "/Library/Frameworks/Python.Framework/Versions/Current/bin/uv" ]; then
-        echo "/Library/Frameworks/Python.Framework/Versions/Current/bin/uv"
-        return
-    fi
-    if [ -f "/opt/python/Current/bin" ]; then
-        echo "/opt/python/Current/bin/uv"
-        return
-    fi
-    echo "$(which uv)"
-}