fix(decompress): Fix Split-Path -LeafBase in PS5 (ScoopInstaller#4639)

se35710 · Mar 8, 2022 · 9afe8b2 · 9afe8b2
1 parent 5f01a71
commit 9afe8b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - **depends:** Prevent error on no URL ([#4595](https://github.com/ScoopInstaller/Scoop/issues/4595))
 - **depends:** Check if extractor is available ([#4042](https://github.com/ScoopInstaller/Scoop/issues/4042))
 - **decompress:** Fix nested Zstd archive extraction ([#4608](https://github.com/ScoopInstaller/Scoop/issues/4608))
+  - **decompress:** Fix `Split-Path -LeafBase` in PS5 ([#4639](https://github.com/ScoopInstaller/Scoop/issues/4639))
 - **shim:** Fix PS1 shim error when in different drive in PS7 ([#4614](https://github.com/ScoopInstaller/Scoop/issues/4614))
 - **shim:** Fix `sh` shim error in WSL ([#4637](https://github.com/ScoopInstaller/Scoop/issues/4637))
 

diff --git a/lib/decompress.ps1 b/lib/decompress.ps1
@@ -165,7 +165,7 @@ function Expand-ZstdArchive {
     }
     if ($IsTar) {
         # Check for tar
-        $TarFile = Join-Path $DestinationPath (Split-Path $Path -LeafBase)
+        $TarFile = Join-Path $DestinationPath (strip_ext (fname $Path))
         Expand-7zipArchive -Path $TarFile -DestinationPath $DestinationPath -ExtractDir $ExtractDir -Removal
     }
 }