python2/3 agnostic

d-w-moore · Mar 19, 2024 · bd627eb · bd627eb
1 parent 5e7dd66
commit bd627eb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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 \