Fix condition to check if extension is enabled

src/darwin.sh

@@ -1,13 +1,7 @@
-version=$(php-config --version | cut -c 1-3)
-if [ "$version" != "$1" ]; then
-	export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-	brew tap exolnet/homebrew-deprecated > /dev/null 2>&1;
-	brew unlink php;
-	brew install php@"$1";
-	brew link --force --overwrite php@"$1";
-else
-	sudo cp /etc/php.ini.default /etc/php.ini
-fi
+export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
+brew tap exolnet/homebrew-deprecated > /dev/null 2>&1;	
+brew install php@"$1";
+brew link --force --overwrite php@"$1";
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 ext_dir=$(/usr/bin/php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 sudo chmod 777 "$ini_file"

src/features.ts

@@ -28,14 +28,10 @@ export async function addINIValues(ini_values_csv: string, os_version: string) {
  * @param extension
  */
 export async function enableExtensionWindows(extension: string) {
-  return `try {
-  $${extension}_found = 0
-  $ext_dir = Get-PhpIniKey extension_dir
+  return `try {  
   $exist = Test-Path -Path $ext_dir\\php_${extension}.dll
-  $enabled = php -r "if (in_array('${extension}', get_loaded_extensions())) {echo 'yes';} else {echo 'no';}"
-  if($enabled -eq 'no' -and $exist) {
-    Enable-PhpExtension ${extension} C:\\tools\\php
-    $${extension}_found = 1
+  if(!(php -m | findstr -i ${extension}) -and $exist) {
+    Enable-PhpExtension ${extension} C:\\tools\\php  
   }
 } catch [Exception] {
   echo $_
@@ -48,12 +44,9 @@ export async function enableExtensionWindows(extension: string) {
  * @param extension
  */
 export async function enableExtensionUnix(extension: string) {
-  return `${extension}_found=0
-enabled=$(php -r "if (in_array('${extension}', get_loaded_extensions())) {echo 'yes';} else {echo 'no';}")
-if [ "$enabled" = "no" ] && [ -e "$ext_dir/${extension}.so" ]; then
+  return `if [ ! "$(php -m | grep ${extension})" ] && [ -e "$ext_dir/${extension}.so" ]; then
   echo "extension=${extension}.so" >> 'php -i | grep "Loaded Configuration" | sed -e "s|.*=>\s*||"'
-  echo "${extension} enabled"
-  ${extension}_found=1
+  echo "${extension} enabled"  
 fi\n`;
 }
 
@@ -72,9 +65,9 @@ export async function addExtensionDarwin(
     script += await enableExtensionUnix(extension);
     if (await pecl.checkPECLExtension(extension)) {
       script +=
-        'if [ $' +
+        'if [ ! "$(php -m | grep ' +
         extension +
-        '_found -eq 0 ]; then sudo pecl install ' +
+        ')" ]; then sudo pecl install ' +
         extension +
         ' || echo "Couldn\'t find extension: ' +
         extension +
@@ -105,9 +98,9 @@ export async function addExtensionWindows(
     }
     if (await pecl.checkPECLExtension(extension)) {
       script +=
-        'if($' +
+        'if(!(php -m | findstr -i ' +
         extension +
-        '_found -eq 0) { ' +
+        ')) { ' +
         'try { Install-PhpExtension ' +
         extension +
         ' -MinimumStability ' +
@@ -136,9 +129,9 @@ export async function addExtensionLinux(
     // add script to enable extension is already installed along with php
     script += await enableExtensionUnix(extension);
     script +=
-      'if [ $' +
+      'if [ ! "$(php -m | grep ' +
       extension +
-      '_found -eq 0 ]; then sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
+      ')" ]; then sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
       version +
       '-' +
       extension +

src/win32.ps1

@@ -36,5 +36,6 @@ if($version -lt '7.4') {
 
 echo "Installing Composer"
 Install-Composer -Scope System -Path C:\tools\php
+$ext_dir = Get-PhpIniKey extension_dir
 php -v
 composer -V