Merge pull request #287 from aminya/unzip-windows [skip ci]

aminya · Sep 10, 2024 · 691fa79 · 691fa79
2 parents 5e68b68 + 01e15ae
commit 691fa79
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.mjs b/dist/modern/setup-cpp.mjs
diff --git a/dist/modern/setup-cpp.mjs.map b/dist/modern/setup-cpp.mjs.map
diff --git a/src/utils/setup/extract.ts b/src/utils/setup/extract.ts
@@ -90,13 +90,19 @@ export function extractExe(file: string, dest: string) {
 
 /// Extract Zip using unzip or 7z
 export async function extractZip(file: string, dest: string) {
-  // if unzip is available use it
+  // prefer 7z if available (faster especially on Windows)
+  if (which.sync("7z", { nothrow: true }) !== null) {
+    return extract7Zip(file, dest)
+  }
+
+  // if unzip is available use it (usually available on posix systems)
   if (which.sync("unzip", { nothrow: true }) !== null) {
     await execa("unzip", ["-q", file, "-d", dest], { stdio: "inherit" })
     await grantUserWriteAccess(dest)
     return dest
   }
 
+  // fallback to 7z (will install 7z if needed)
   return extract7Zip(file, dest)
 }