Fix extension_version on windows

Sp0ne · Feb 14, 2020 · d99c873 · d99c873
1 parent 2c559ea
commit d99c873
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -2765,13 +2765,7 @@ function addExtensionWindows(extension_csv, version, pipe) {
                         break;
                     // match exact versions
                     case /.*-\d+\.\d+\.\d+/.test(version_extension):
-                        script +=
-                            '\nAdd-Extension ' +
-                                extension_name +
-                                ' ' +
-                                'stable' +
-                                ' ' +
-                                stability;
+                        script += '\nAdd-Extension ' + extension_name + ' stable ' + stability;
                         return;
                     // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
                     case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):

diff --git a/src/extensions.ts b/src/extensions.ts
@@ -104,13 +104,7 @@ export async function addExtensionWindows(
         break;
       // match exact versions
       case /.*-\d+\.\d+\.\d+/.test(version_extension):
-        script +=
-          '\nAdd-Extension ' +
-          extension_name +
-          ' ' +
-          'stable' +
-          ' ' +
-          stability;
+        script += '\nAdd-Extension ' + extension_name + ' stable ' + stability;
         return;
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):

diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1
@@ -55,7 +55,10 @@ Function Add-Extension {
       }
     }
     else {
-      Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Version $extension_version -Path $php_dir
+      if($extension_version -ne '') {
+        $extension = "$extension -Version $extension_version"
+      }
+      Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
       Add-Log $tick $extension "Installed and enabled"
     }
   }