github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-09-20 01:15:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring.

Browse source 
Remove leading `build_package_` from `build_package_verify_python` and
`build_package_verify_import` since they are not `build_package`
functions.
This commit is contained in:
Yamashita Yuu 2014-02-13 23:44:42 +09:00
parent 854f6f3a46
commit 5f23e3d7b2
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1104,9 +1104,8 @@ apply_python_patch() {
esac esac
} }
build_package_verify_python() { verify_python() {
local package_name="$1" local python="$1"
local python="$2"
if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
# Only symlinks are installed in ${PREFIX_PATH}/bin # Only symlinks are installed in ${PREFIX_PATH}/bin
rm -fr "${PREFIX_PATH}/bin" rm -fr "${PREFIX_PATH}/bin"
@ -1123,7 +1122,7 @@ build_package_verify_python() {
# Post-install check for Python 2.4.x # Post-install check for Python 2.4.x
build_package_verify_py24() { build_package_verify_py24() {
build_package_verify_python "$1" "${2:-python2.4}" verify_python "${2:-python2.4}"
build_package_verify_readline "$1" "${2:-python2.4}" build_package_verify_readline "$1" "${2:-python2.4}"
build_package_verify_zlib "$1" "${2:-python2.4}" build_package_verify_zlib "$1" "${2:-python2.4}"
build_package_verify_bz2 "$1" "${2:-python2.4}" build_package_verify_bz2 "$1" "${2:-python2.4}"
@ -1148,7 +1147,7 @@ build_package_verify_py27() {
# Post-install check for Python 3.0.x # Post-install check for Python 3.0.x
build_package_verify_py30() { build_package_verify_py30() {
build_package_verify_python "$1" "${2:-python3.0}" verify_python "${2:-python3.0}"
build_package_verify_readline "$1" "${2:-python3.0}" build_package_verify_readline "$1" "${2:-python3.0}"
build_package_verify_ssl "$1" "${2:-python3.0}" build_package_verify_ssl "$1" "${2:-python3.0}"
build_package_verify_sqlite3 "$1" "${2:-python3.0}" build_package_verify_sqlite3 "$1" "${2:-python3.0}"
@ -1188,7 +1187,7 @@ build_package_ensurepip() {
fi fi
} }
build_package_verify_import() { verify_python_module() {
local module="${1}" local module="${1}"
local module_name="${2:-${module}}" local module_name="${2:-${module}}"
{ if ! "$PYTHON_BIN" -c "import ${module}"; then { if ! "$PYTHON_BIN" -c "import ${module}"; then
@ -1205,27 +1204,27 @@ build_package_verify_import() {
# Post-install check that the readline extension was built. # Post-install check that the readline extension was built.
build_package_verify_readline() { build_package_verify_readline() {
build_package_verify_import "readline" "GNU readline lib" verify_python_module "readline" "GNU readline lib"
} }
# Post-install check that the ssl extension was built. # Post-install check that the ssl extension was built.
build_package_verify_ssl() { build_package_verify_ssl() {
build_package_verify_import "ssl" "OpenSSL lib" verify_python_module "ssl" "OpenSSL lib"
} }
# Post-install check that the sqlite3 extension was built. # Post-install check that the sqlite3 extension was built.
build_package_verify_sqlite3() { build_package_verify_sqlite3() {
build_package_verify_import "sqlite3" "SQLite3 lib" verify_python_module "sqlite3" "SQLite3 lib"
} }
# Post-install check that the zlib extension was built. # Post-install check that the zlib extension was built.
build_package_verify_zlib() { build_package_verify_zlib() {
build_package_verify_import "zlib" "zlib" verify_python_module "zlib" "zlib"
} }
# Post-install check that the bz2 extension was built. # Post-install check that the bz2 extension was built.
build_package_verify_bz2() { build_package_verify_bz2() {
build_package_verify_import "bz2" "bzip2 lib" verify_python_module "bz2" "bzip2 lib"
} }
version() { version() {