From bd627eba5940553b0ffc29284278b04a6b614944 Mon Sep 17 00:00:00 2001 From: d-w-moore Date: Mon, 18 Mar 2024 22:22:12 -0400 Subject: [PATCH] python2/3 agnostic --- docker-testing/run_tests.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-testing/run_tests.sh b/docker-testing/run_tests.sh index a1f53b5e..9f94395f 100755 --- a/docker-testing/run_tests.sh +++ b/docker-testing/run_tests.sh @@ -1,11 +1,15 @@ #!/bin/bash set -e -x +PYTHON=$(which python3) +if [ -z "$PYTHON" ]; then + PYTHON=$(which python) +fi DIR=$(dirname "$0") cd "$DIR" -./recv_oneshot -h irods-catalog-provider -p 8888 -t 360 +$PYTHON ./recv_oneshot -h irods-catalog-provider -p 8888 -t 360 REPO="$(./print_repo_root_location)" -python -m pip install "$REPO[tests]" -./iinit.py \ +$PYTHON -m pip install "$REPO[tests]" +$PYTHON ./iinit.py \ host irods-catalog-provider \ port 1247 \ user rods \