diff --git a/evergreen/multiversion_selection.sh b/evergreen/multiversion_selection.sh index 0366cfa30c1..ad21f9e5617 100644 --- a/evergreen/multiversion_selection.sh +++ b/evergreen/multiversion_selection.sh @@ -9,10 +9,6 @@ set -o verbose activate_venv setup_db_contrib_tool -export PIPX_HOME="${workdir}/pipx" -export PIPX_BIN_DIR="${workdir}/pipx/bin" -export PATH="$PATH:$PIPX_BIN_DIR" - edition="${multiversion_edition}" platform="${multiversion_platform}" architecture="${multiversion_architecture}" diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh index 47b4b5148d6..d5f31baa9aa 100644 --- a/evergreen/multiversion_setup.sh +++ b/evergreen/multiversion_setup.sh @@ -9,10 +9,6 @@ set -o verbose activate_venv setup_db_contrib_tool -export PIPX_HOME="${workdir}/pipx" -export PIPX_BIN_DIR="${workdir}/pipx/bin" -export PATH="$PATH:$PIPX_BIN_DIR" - link_dir="${multiversion_link_dir}" install_dir="${multiversion_install_dir}" rm -rf $link_dir $install_dir diff --git a/evergreen/prelude_db_contrib_tool.sh b/evergreen/prelude_db_contrib_tool.sh index d47af6914dc..0620ab71357 100755 --- a/evergreen/prelude_db_contrib_tool.sh +++ b/evergreen/prelude_db_contrib_tool.sh @@ -1,6 +1,6 @@ function setup_db_contrib_tool { # check if db-contrib-tool is already installed - if [[ $(type -P db-contrib-tool) ]]; then + if [[ -f "${workdir}/bin/db-contrib-tool" ]] || [[ -f "${workdir}/bin/db-contrib-tool.exe" ]]; then return 0 fi