github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

s/getpip/get_pip/g

Browse source
This commit is contained in:
Yamashita Yuu 2014-06-15 14:36:23 +09:00
parent d805ec19ca
commit f6a5eb90a1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/python-build/bin/python-build
View file

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