fix(decompress): Match extract_dir/extract_to and archives (#5983)

ScoopInstaller · May 26, 2024 · dec4232 · dec4232
1 parent fa1b42b
commit dec4232
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - **scoop-download|install|update:** Use consistent options ([#5956](https://github.com/ScoopInstaller/Scoop/issues/5956))
 - **core:** Fix "Invoke-ExternalCommand" quoting rules ([#5945](https://github.com/ScoopInstaller/Scoop/issues/5945))
 - **scoop-info:** Fix download size estimating ([#5958](https://github.com/ScoopInstaller/Scoop/issues/5958))
+- **decompress:** Match `extract_dir`/`extract_to` and archives ([#5983](https://github.com/ScoopInstaller/Scoop/issues/5983))
 - **checkver:** Correct variable 'regex' to 'regexp' ([#5993](https://github.com/ScoopInstaller/Scoop/issues/5993))
 
 ### Code Refactoring

diff --git a/lib/decompress.ps1 b/lib/decompress.ps1
@@ -13,20 +13,16 @@ function Invoke-Extraction {
         $ProcessorArchitecture
     )
 
-    # 'url', 'extract_dir' and 'extract_to' are paired
     $uri = @(url $Manifest $ProcessorArchitecture)
+    # 'extract_dir' and 'extract_to' are paired
     $extractDir = @(extract_dir $Manifest $ProcessorArchitecture)
     $extractTo = @(extract_to $Manifest $ProcessorArchitecture)
+    $extracted = 0
 
     for ($i = 0; $i -lt $Name.Length; $i++) {
-        $fnArgs = @{
-            Path            = Join-Path $Path $Name[$i]
-            DestinationPath = Join-Path $Path $extractTo[$i]
-            ExtractDir      = $extractDir[$i]
-        }
         # work out extraction method, if applicable
         $extractFn = $null
-        switch -regex ($fnArgs.Path) {
+        switch -regex ($Name[$i]) {
             '\.zip$' {
                 if ((Test-HelperInstalled -Helper 7zip) -or ((get_config 7ZIPEXTRACT_USE_EXTERNAL) -and (Test-CommandAvailable 7z))) {
                     $extractFn = 'Expand-7zipArchive'
@@ -51,11 +47,17 @@ function Invoke-Extraction {
             }
         }
         if ($extractFn) {
+            $fnArgs = @{
+                Path            = Join-Path $Path $Name[$i]
+                DestinationPath = Join-Path $Path $extractTo[$extracted]
+                ExtractDir      = $extractDir[$extracted]
+            }
             Write-Host 'Extracting ' -NoNewline
             Write-Host $(url_remote_filename $uri[$i]) -ForegroundColor Cyan -NoNewline
             Write-Host ' ... ' -NoNewline
             & $extractFn @fnArgs -Removal
             Write-Host 'done.' -ForegroundColor Green
+            $extracted++
         }
     }
 }