From 3454287b87d4931280c614546def4a853dc38679 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sun, 2 Feb 2020 15:23:02 +0530
Subject: [PATCH] Improve phalcon scripts

---
 src/scripts/ext/phalcon.ps1       |   2 +-
 src/scripts/ext/phalcon.sh        |  22 ++++++----------------
 src/scripts/ext/phalcon_darwin.sh |   7 +------
 update.zip                        | Bin 0 -> 2879 bytes
 4 files changed, 8 insertions(+), 23 deletions(-)
 create mode 100644 update.zip

diff --git a/src/scripts/ext/phalcon.ps1 b/src/scripts/ext/phalcon.ps1
index 1a9f5fb6..900b2887 100644
--- a/src/scripts/ext/phalcon.ps1
+++ b/src/scripts/ext/phalcon.ps1
@@ -22,7 +22,7 @@ Function Install-Phalcon() {
         $zip_file = $match.Matches[0].Groups[1].Value
         Invoke-WebRequest -UseBasicParsing -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
         Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
-        New-Item -ItemType SymbolicLink -Path $ext_dir\php_phalcon.dll -Target $ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll > $null 2>&1
+        Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
         Enable-PhpExtension -Extension phalcon -Path $php_dir
     }
     printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick $extension "Installed and enabled"
diff --git a/src/scripts/ext/phalcon.sh b/src/scripts/ext/phalcon.sh
index 5642f6f0..6ae5839d 100644
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@@ -27,14 +27,7 @@ install_phalcon() {
   add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
 }
 
-# Function to remove an extensions
-remove_extension() {
-  extension=$1
-  sudo sed -i "/$extension/d" "$ini_file"
-  rm -rf "$ext_dir/$extension.so"
-}
-
-ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+ini_file="/etc/php/$2/cli/conf.d/50-phalcon.ini"
 ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')
 extension_major_version=$(echo "$1" | grep -i -Po '\d')
@@ -44,18 +37,16 @@ cross="✗"
 
 if [ "$extension_major_version" = "4" ]; then
   if [ -e "$ext_dir/psr.so" ]; then
-    echo "extension=psr" >>"$ini_file"
+    echo "extension=psr.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
   fi
 
   if [ -e "$ext_dir/phalcon.so" ]; then
     if php -m | grep -i -q -w psr; then
-      echo "extension=phalcon" >>"$ini_file"
-      phalcon_version=$(php -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+      phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
       if [ "$phalcon_version" != "$extension_major_version" ]; then
-        remove_extension "psr" >/dev/null 2>&1
-        remove_extension "phalcon" >/dev/null 2>&1
         install_phalcon "$1" "$2"
       else
+        echo "extension=phalcon.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
         add_log "$tick" "$1" "Enabled"
       fi
     else
@@ -68,12 +59,11 @@ fi
 
 if [ "$extension_major_version" = "3" ]; then
   if [ -e "$ext_dir/phalcon.so" ]; then
-    echo "extension=phalcon" >>"$ini_file"
-    phalcon_version=$(php -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
     if [ "$phalcon_version" != "$extension_major_version" ]; then
-      remove_extension "phalcon" >/dev/null 2>&1
       install_phalcon "$1" "$2"
     else
+      echo "extension=phalcon.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
       add_log "$tick" "$1" "Enabled"
     fi
   else
diff --git a/src/scripts/ext/phalcon_darwin.sh b/src/scripts/ext/phalcon_darwin.sh
index 777ebd0b..8869c304 100644
--- a/src/scripts/ext/phalcon_darwin.sh
+++ b/src/scripts/ext/phalcon_darwin.sh
@@ -6,13 +6,8 @@ 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_semver=$(php -r "echo phpversion('phalcon');")
-  phalcon_version=$(echo "$phalcon_semver" | cut -d'.' -f 1)
+  phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
   if [ "$phalcon_version" != "$extension_major" ]; then
-    sudo sed -i '' "/psr/d" "$ini_file"
-    sudo sed -i '' "/phalcon/d" "$ini_file"
-    rm -rf "$ext_dir"/psr.so
-    rm -rf "$ext_dir"/phalcon.so
     brew tap shivammathur/homebrew-phalcon
     brew install phalcon@"$php_version"_"$extension_major"
   fi
diff --git a/update.zip b/update.zip
new file mode 100644
index 0000000000000000000000000000000000000000..f4bdf08b816208cb1f1bda937d628e267182638b
GIT binary patch
literal 2879
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
NwkYdEb}Du%{|2n_qH_QM

literal 0
HcmV?d00001