diff --git a/scripts/osx-install.sh b/scripts/osx-install.sh index 8a3450db..ab6b07e5 100644 --- a/scripts/osx-install.sh +++ b/scripts/osx-install.sh @@ -1,7 +1,7 @@ brew install pyenv py_full_version="${TRAVIS_PYTHON_VERSION}" if [ -n "${py_full_version##*.*.*}" ]; then # Do we have the full version number? - pyenv install "$[py_full_version}" + pyenv install "${py_full_version}" else git clone --depth=1 "https://github.com/momo-lab/xxenv-latest.git" "$(pyenv root)/plugins/xxenv-latest" pyenv install-latest "${py_full_version}" diff --git a/scripts/windows-install.sh b/scripts/windows-install.sh index c4a55491..f85d11e2 100644 --- a/scripts/windows-install.sh +++ b/scripts/windows-install.sh @@ -1,9 +1,9 @@ urlbase="https://www.python.org/ftp/python/" py_base_version="$1" -if [ -n "$[py_base_version}" ]; then +if [ -n "${py_base_version}" ]; then py_base_version="$(printf "%s" "${TRAVIS_PYTHON_VERSION}" | sed 's/[][\\\.]/\\\0/g')" # escape for sed fi -py_full_version="$(curl -s -L --compressed "${urlbase}" | sed -n 's/.*.*/\1/p' | tail -n 1)" +py_full_version="$(curl -s -L "${urlbase}" | sed -n "s/.*.*/\1/p" | tail -n 1)" if [ -n "${py_full_version}" ]; then arch_suffix="" if [ "${HOSTTYPE}" = "x86_64" ]; then @@ -16,9 +16,9 @@ if [ -n "${py_full_version}" ]; then MSYS2_ARG_CONV_EXCL="*" "${installer}" /quiet PrependPath=1 InstallAllUsers=1 TargetDir="${targetdir}" python="${targetdir}\python.exe" rm -f -- "${installer}" - "${python}" -m venv env + "${python}" -m venv venv ( - . "env/Scripts/activate" + . "venv/Scripts/activate" python -m pip install -U pip python -m pip install -r requirements.txt )