diff --git a/src/scripts/extensions/add_extensions.sh b/src/scripts/extensions/add_extensions.sh index 46b862ce..73511abb 100644 --- a/src/scripts/extensions/add_extensions.sh +++ b/src/scripts/extensions/add_extensions.sh @@ -234,12 +234,21 @@ add_pecl_extension() { [ -n "$pecl_version" ] && sudo rm -f "${ext_dir:?}/$extension-$pecl_version" [ -n "$pecl_version" ] && pecl_version="-$pecl_version" pecl_install "$extension$pecl_version" || ( [ "${fail_fast:?}" = "false" ] && add_extension "$extension" "$(get_extension_prefix "$extension")" >/dev/null 2>&1) - extension_version="$(php -r "echo phpversion('$extension');")" + if ! extension_version="$(php -d display_errors=0 -d display_startup_errors=0 -r "echo phpversion('$extension'); exit(extension_loaded('$extension') ? 0 : 1);" 2>/dev/null)"; then + add_log "${cross:?}" "$extension" "Could not install $extension on PHP ${semver:?}" + return + fi + if [ -n "$pecl_version" ] && [ "${extension_version/-/}" != "${pecl_version#-}" ]; then + [ "${fail_fast:?}" = "true" ] && add_log "${cross:?}" "$extension-$extension_version" "Installed and enabled, but $extension$pecl_version was requested" + add_log "!" "$extension-$extension_version" "Installed and enabled, but $extension$pecl_version was requested" + echo "::warning::Installed $extension-$extension_version, but $extension$pecl_version was requested" + return + fi if [ -n "$pecl_version" ] && [ "${extension_version/-/}" = "${pecl_version#-}" ]; then - sudo cp "${ext_dir:?}/$extension.so" "${ext_dir:?}/$extension-$extension_version" 2>/dev/null || true + sudo cp "${ext_dir:?}/$extension.so" "${ext_dir:?}/$extension$pecl_version" 2>/dev/null || true fi [ -n "$extension_version" ] && extension_version="-$extension_version" - add_extension_log "$extension$extension_version" "Installed and enabled" + add_log "${tick:?}" "$extension$extension_version" "Installed and enabled" fi }