public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Use pickle only if pecl is not installed (#679) 

Fix #674
Fix #678
pull/688/head
Michele Locati 2023-01-20 19:32:20 +01:00 committed by GitHub
parent 9d35d426dd
commit 1841d1ae11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install-php-extensions
View File

@ -3665,14 +3665,13 @@ moduleMayUsePecl() {
# Updates: # Updates:
# PHP_MODULES_TO_INSTALL # PHP_MODULES_TO_INSTALL
# Sets: # Sets:
# USE_PICKLE # USE_PICKLE 0: no, 1: yes (already downloaded), 2: yes (build it from source)
configureInstaller() { configureInstaller() {
USE_PICKLE=0 USE_PICKLE=0
if ! which pecl >/dev/null; then
for PHP_MODULE_TO_INSTALL in $PHP_MODULES_TO_INSTALL; do for PHP_MODULE_TO_INSTALL in $PHP_MODULES_TO_INSTALL; do
if moduleMayUsePecl "$PHP_MODULE_TO_INSTALL"; then if ! moduleMayUsePecl "$PHP_MODULE_TO_INSTALL"; then
if test $PHP_MAJMIN_VERSION -lt 800; then continue
pecl channel-update pecl.php.net || true
return
fi fi
if false && anyStringInList '' "$PHP_MODULES_TO_INSTALL"; then if false && anyStringInList '' "$PHP_MODULES_TO_INSTALL"; then
USE_PICKLE=2 USE_PICKLE=2
@ -3681,9 +3680,12 @@ configureInstaller() {
chmod +x /tmp/pickle chmod +x /tmp/pickle
USE_PICKLE=1 USE_PICKLE=1
fi fi
return break
fi
done done
fi
if test $USE_PICKLE -eq 0; then
pecl channel-update pecl.php.net || true
fi
} }
buildPickle() { buildPickle() {