v1 maintenance release

src/extensions.ts

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

src/scripts/darwin.sh

@@ -96,12 +96,13 @@ add_tool() {
     if [ "$status_code" = "200" ]; then
       sudo chmod a+x "$tool_path"
       if [ "$tool" = "phive" ]; then
-        add_extension curl >/dev/null 2>&1
-        add_extension mbstring >/dev/null 2>&1
-        add_extension xml >/dev/null 2>&1
+        add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
+        add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
+        add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1
       elif [ "$tool" = "cs2pr" ]; then
         sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
-        tr -d '\r' < "$tool_path" | sudo tee "$tool_path" >/dev/null 2>&1
+        tr -d '\r' < "$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
+        sudo chmod a+x "$tool_path"
       fi
       add_log "$tick" "$tool" "Added"
     else
@@ -148,15 +149,24 @@ setup_php_and_composer() {
 tick="✓"
 cross="✗"
 version=$1
+existing_version=$(php-config --version | cut -c 1-3)
 
-# Setup PHP and composer
+# Setup PHP
 step_log "Setup PHP"
-setup_php_and_composer
+if [ "$existing_version" != "$version" ]; then
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1
+  brew tap shivammathur/homebrew-php >/dev/null 2>&1
+  brew install shivammathur/php/php@"$version" >/dev/null 2>&1
+  brew link --force --overwrite php@"$version" >/dev/null 2>&1
+  status="Installed"
+else
+  status="Found"
+fi
 ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-echo "date.timezone=UTC" >>"$ini_file"
-ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 sudo chmod 777 "$ini_file"
-mkdir -p "$(pecl config-get ext_dir)"
+echo "date.timezone=UTC" >>"$ini_file"
+ext_dir=$(php -i | grep -Ei "extension_dir => /(usr|opt)" | sed -e "s|.*=> s*||")
+sudo mkdir -p "$ext_dir"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-add_log "$tick" "PHP" "Installed PHP $semver"
 configure_pecl
+add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/ext/extensions.sh

@@ -1,15 +0,0 @@
-php_h="https://raw.githubusercontent.com/php/php-src/PHP-$2/main/php.h"
-os=$(uname -s)
-if [ "$os" = "Linux" ]; then
-  apiv=$(curl -sSL --retry 5 "$php_h" | grep "PHP_API_VERSION" | cut -d' ' -f 3)
-  dir="/usr/lib/php/$apiv"
-  sudo mkdir -p "$dir" && sudo chown -R "$USER":"$(id -g -n)" /usr/lib/php
-elif [ "$os" = "Darwin" ]; then
-  apiv=$(curl -sSL --retry 5 "$php_h" | grep "PHP_API_VERSION" | cut -d' ' -f 3)
-  dir="/usr/local/lib/php/pecl/$apiv"
-else
-  dir='C:\\tools\\php\\ext'
-fi
-hash=$(echo -n "$1" | openssl dgst -sha256 | cut -d ' ' -f 2)
-echo "::set-output name=ext_dir::$dir"
-echo "::set-output name=ext_hash::$hash"

src/scripts/ext/phalcon_darwin.sh

@@ -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_major=${extension: -1}
 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")
 ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
-  echo "extension=psr" >>"$ini_file"
-  echo "extension=phalcon" >>"$ini_file"
-  phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+  phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
   if [ "$phalcon_version" != "$extension_major" ]; then
-    brew tap shivammathur/homebrew-phalcon
-    brew install phalcon@"$php_version"_"$extension_major"
+    install_phalcon
+  else
+    echo "extension=psr.so" >>"$ini_file"
+    echo "extension=phalcon.so" >>"$ini_file"
+    add_log "$tick" "$extension" "Enabled"
   fi
 else
-  brew tap shivammathur/homebrew-phalcon
-  brew install phalcon@"$php_version"_"$extension_major"
+  install_phalcon
 fi