mirror of
https://github.com/shivammathur/setup-php.git
synced 2024-11-26 13:23:05 +07:00
Fix getting scan dir on macOS for old PHP
This commit is contained in:
parent
e554590514
commit
8eb9866044
@ -207,6 +207,15 @@ add_php_config() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Function to get scan directory.
|
||||||
|
get_scan_dir() {
|
||||||
|
if [[ "$version" =~ ${old_versions:?} ]]; then
|
||||||
|
php --ini | grep additional | sed -e "s|.*: s*||"
|
||||||
|
else
|
||||||
|
echo "$ini_dir"/conf.d
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Function to Setup PHP.
|
# Function to Setup PHP.
|
||||||
setup_php() {
|
setup_php() {
|
||||||
step_log "Setup PHP"
|
step_log "Setup PHP"
|
||||||
@ -228,7 +237,7 @@ setup_php() {
|
|||||||
php_config="$(command -v php-config)"
|
php_config="$(command -v php-config)"
|
||||||
ext_dir="$(grep 'extension_dir=' "$php_config" | cut -d "'" -f 2)"
|
ext_dir="$(grep 'extension_dir=' "$php_config" | cut -d "'" -f 2)"
|
||||||
ini_dir="$(php_ini_path)"
|
ini_dir="$(php_ini_path)"
|
||||||
scan_dir="$ini_dir"/conf.d
|
scan_dir="$(get_scan_dir)"
|
||||||
ini_file="$ini_dir"/php.ini
|
ini_file="$ini_dir"/php.ini
|
||||||
sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
|
sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
|
||||||
sudo chmod 777 "$ini_file" "${tool_path_dir:?}"
|
sudo chmod 777 "$ini_file" "${tool_path_dir:?}"
|
||||||
|
Loading…
Reference in New Issue
Block a user