Fix phalcon caching on darwin

This commit is contained in:
Shivam Mathur 2020-02-15 22:51:02 +05:30
parent f9202d6b64
commit 40944de129
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
3 changed files with 40 additions and 16 deletions

7
dist/index.js vendored
View File

@ -2716,15 +2716,14 @@ function addExtensionDarwin(extension_csv, version, pipe) {
pipe; pipe;
break; break;
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension): case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
install_command = script +=
'sh ' + 'sh ' +
path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') + path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
' ' + ' ' +
extension + extension +
' ' + ' ' +
version + version;
pipe; return;
break;
default: default:
install_command = 'sudo pecl install -f ' + extension + pipe; install_command = 'sudo pecl install -f ' + extension + pipe;
break; break;

View File

@ -55,15 +55,14 @@ export async function addExtensionDarwin(
pipe; pipe;
break; break;
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension): case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
install_command = script +=
'sh ' + 'sh ' +
path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') + path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
' ' + ' ' +
extension + extension +
' ' + ' ' +
version + version;
pipe; return;
break;
default: default:
install_command = 'sudo pecl install -f ' + extension + pipe; install_command = 'sudo pecl install -f ' + extension + pipe;
break; break;

View File

@ -1,17 +1,43 @@
# Function to log result of a operation
add_log() {
mark=$1
subject=$2
message=$3
if [ "$mark" = "$tick" ]; then
printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
else
printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
fi
}
# Function to install phalcon
install_phalcon() {
(
brew tap shivammathur/homebrew-phalcon >/dev/null 2>&1
brew install phalcon@"$php_version"_"$extension_major" >/dev/null 2>&1
sudo cp /usr/local/opt/psr@"$php_version"/psr.so "$ext_dir" >/dev/null 2>&1
sudo cp /usr/local/opt/phalcon@"$php_version"_"$extension_major"/phalcon.so "$ext_dir" >/dev/null 2>&1
add_log "$tick" "$extension" "Installed and enabled"
) || add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
}
tick="✓"
cross="✗"
extension=$1 extension=$1
extension_major=${extension: -1} extension_major=${extension: -1}
php_version=$2 php_version=$2
semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||") ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
echo "extension=psr" >>"$ini_file" phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
echo "extension=phalcon" >>"$ini_file"
phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
if [ "$phalcon_version" != "$extension_major" ]; then if [ "$phalcon_version" != "$extension_major" ]; then
brew tap shivammathur/homebrew-phalcon install_phalcon
brew install phalcon@"$php_version"_"$extension_major" else
echo "extension=psr.so" >>"$ini_file"
echo "extension=phalcon.so" >>"$ini_file"
add_log "$tick" "$extension" "Enabled"
fi fi
else else
brew tap shivammathur/homebrew-phalcon install_phalcon
brew install phalcon@"$php_version"_"$extension_major"
fi fi