Commit 6748afc6 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Unify python version handling across prepare-and-run-* scripts

parent a3719a9b
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -3,7 +3,13 @@
set -e
set -x

PY_EXE=python3.6
if [ "$py_version" == "" ]; then
  py_version=3
fi

if [ "$PY_EXE" == "" ]; then
  PY_EXE=python${py_version}
fi

echo "-----------------------------------------------"
echo "Current directory: $(pwd)"
+10 −4
Original line number Diff line number Diff line
@@ -2,12 +2,18 @@

set -e

if [[ $1 == python* ]]; then
  PY_EXE="$1"
  shift
fi

if test "$PY_EXE" = ""; then
  PY_EXE="python3.6"
if [ "$py_version" == "" ]; then
  py_version=3
fi

if [ "$PY_EXE" == "" ]; then
  PY_EXE=python${py_version}
fi
shift


VERSIONS="$@"
+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@

set -e

if [ "$py_version" == "" ]; then
  py_version=3
fi

if [ "$PY_EXE" == "" ]; then
  PY_EXE=python${py_version}
fi