Improve pecl support

This commit is contained in:
Shivam Mathur
2020-12-17 12:13:39 +05:30
parent ce02569aea
commit b3cd6b4dab
4 changed files with 7 additions and 13 deletions

View File

@ -25,10 +25,7 @@ export async function getScript(
const extension_csv: string = await utils.getInput('extensions', false);
const ini_values_csv: string = await utils.getInput('ini-values', false);
const coverage_driver: string = await utils.getInput('coverage', false);
let tools_csv: string = await utils.getInput('tools', false);
if (/.*-(beta|alpha|devel|snapshot|\d+\.\d+\.\d+).*/.test(extension_csv)) {
tools_csv = 'pecl, ' + tools_csv;
}
const tools_csv: string = await utils.getInput('tools', false);
let script: string = await utils.readScript(filename);
script += await tools.addTools(tools_csv, version, os_version);

View File

@ -112,7 +112,10 @@ enable_extension() {
# Function to configure PECL.
configure_pecl() {
if ! [ -e /tmp/pecl_config ] && command -v pecl >/dev/null && command -v pear >/dev/null; then
if ! [ -e /tmp/pecl_config ]; then
if ! command -v pecl >/dev/null || ! command -v pear >/dev/null; then
add_pecl >/dev/null 2>&1
fi
for script in pear pecl; do
sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
sudo "$script" channel-update "$script".php.net