Fix condition to check if extension is enabled

lib/features.js

@@ -46,14 +46,10 @@ exports.addINIValues = addINIValues;
  */
 function enableExtensionWindows(extension) {
     return __awaiter(this, void 0, void 0, function* () {
-        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 $_
@@ -68,12 +64,9 @@ exports.enableExtensionWindows = enableExtensionWindows;
  */
 function enableExtensionUnix(extension) {
     return __awaiter(this, void 0, void 0, function* () {
-        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`;
     });
 }
@@ -93,9 +86,9 @@ function addExtensionDarwin(extension_csv) {
                 script += yield enableExtensionUnix(extension);
                 if (yield 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 +
@@ -127,9 +120,9 @@ function addExtensionWindows(extension_csv, version) {
                 }
                 if (yield pecl.checkPECLExtension(extension)) {
                     script +=
-                        'if($' +
+                        'if(!(php -m | findstr -i ' +
                             extension +
-                            '_found -eq 0) { ' +
+                            ')) { ' +
                             'try { Install-PhpExtension ' +
                             extension +
                             ' -MinimumStability ' +
@@ -159,9 +152,9 @@ function addExtensionLinux(extension_csv, version) {
                 // add script to enable extension is already installed along with php
                 script += yield 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 +
@@ -207,8 +200,7 @@ function addINIValuesWindows(ini_values_csv) {
         yield utils.asyncForEach(ini_values, function (ini_value) {
             return __awaiter(this, void 0, void 0, function* () {
                 // add script to set ini value
-                script +=
-                    'Add-Content C:\\tools\\php\\php.ini "' + ini_value + '"\n';
+                script += 'Add-Content C:\\tools\\php\\php.ini "' + ini_value + '"\n';
             });
         });
         return script;