Run switch_version before check_extensions on Linux

This commit is contained in:
Shivam Mathur 2022-09-11 09:19:35 +05:30
parent 633321754d
commit 7aff4d7a22
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A

View File

@ -88,8 +88,8 @@ add_devtools() {
if ! command -v "$tool$version" >/dev/null; then if ! command -v "$tool$version" >/dev/null; then
install_packages "php$version-dev" install_packages "php$version-dev"
fi fi
add_extension xml extension >/dev/null 2>&1
switch_version "phpize" "php-config" switch_version "phpize" "php-config"
add_extension xml extension >/dev/null 2>&1
add_log "${tick:?}" "$tool" "Added $tool $semver" add_log "${tick:?}" "$tool" "Added $tool $semver"
} }
@ -139,7 +139,6 @@ add_packaged_php() {
add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
IFS=' ' read -r -a packages <<<"$(sed "s/[^ ]*/php$version-&/g" "$src"/configs/php_packages | tr '\n' ' ')" IFS=' ' read -r -a packages <<<"$(sed "s/[^ ]*/php$version-&/g" "$src"/configs/php_packages | tr '\n' ' ')"
install_packages "${packages[@]}" install_packages "${packages[@]}"
add_pecl
else else
run_script "php-ubuntu" "$version" run_script "php-ubuntu" "$version"
fi fi
@ -166,6 +165,7 @@ add_php() {
else else
add_packaged_php add_packaged_php
switch_version >/dev/null 2>&1 switch_version >/dev/null 2>&1
add_pecl
fi fi
status="Installed" status="Installed"
} }