diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index c21dea94..3a448de8 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1381,9 +1381,9 @@ build_package_ez_setup() { } } -build_package_getpip() { - local getpip="${BUILD_PATH}/get-pip.py" - rm -f "${getpip}" +build_package_get_pip() { + local get_pip="${BUILD_PATH}/get-pip.py" + rm -f "${get_pip}" { if [ "${GET_PIP+defined}" ] && [ -f "${GET_PIP}" ]; then echo "Installing pip from ${GET_PIP}..." 1>&2 cat "${GET_PIP}" @@ -1392,8 +1392,8 @@ build_package_getpip() { echo "Installing pip from ${GET_PIP_URL}..." 1>&2 http get "${GET_PIP_URL}" fi - } 1> "${getpip}" - "${PYTHON_BIN}" "${getpip}" 1>&4 2>&1 || { + } 1> "${get_pip}" + "${PYTHON_BIN}" "${get_pip}" 1>&4 2>&1 || { echo "error: failed to install pip via get-pip.py" >&2 return 1 } @@ -1401,7 +1401,7 @@ build_package_getpip() { build_package_ensurepip() { "$PYTHON_BIN" -m ensurepip 1>/dev/null 2>&1 || { - build_package_ez_setup "$@" && build_package_getpip "$@" + build_package_ez_setup "$@" && build_package_get_pip "$@" } || return 1 create_symlinks "$("$PYTHON_BIN" -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"