SERVER-114974 Avoid conflicts with pipx-installed versions of db-contrib-tool (#45758)
GitOrigin-RevId: a4aa639b1070ae8fd196c8e7372634575f8eca6d
This commit is contained in:
parent
4838ae7ad5
commit
34e6caf096
@ -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}"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user