Skip to content

Commit 9afe8b2

Browse files
niheavense35710
authored andcommitted
fix(decompress): Fix Split-Path -LeafBase in PS5 (ScoopInstaller#4639)
1 parent 5f01a71 commit 9afe8b2

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- **depends:** Prevent error on no URL ([#4595](https://github.com/ScoopInstaller/Scoop/issues/4595))
1414
- **depends:** Check if extractor is available ([#4042](https://github.com/ScoopInstaller/Scoop/issues/4042))
1515
- **decompress:** Fix nested Zstd archive extraction ([#4608](https://github.com/ScoopInstaller/Scoop/issues/4608))
16+
- **decompress:** Fix `Split-Path -LeafBase` in PS5 ([#4639](https://github.com/ScoopInstaller/Scoop/issues/4639))
1617
- **shim:** Fix PS1 shim error when in different drive in PS7 ([#4614](https://github.com/ScoopInstaller/Scoop/issues/4614))
1718
- **shim:** Fix `sh` shim error in WSL ([#4637](https://github.com/ScoopInstaller/Scoop/issues/4637))
1819

lib/decompress.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function Expand-ZstdArchive {
165165
}
166166
if ($IsTar) {
167167
# Check for tar
168-
$TarFile = Join-Path $DestinationPath (Split-Path $Path -LeafBase)
168+
$TarFile = Join-Path $DestinationPath (strip_ext (fname $Path))
169169
Expand-7zipArchive -Path $TarFile -DestinationPath $DestinationPath -ExtractDir $ExtractDir -Removal
170170
}
171171
}

0 commit comments

Comments
 (0)