Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes pipeline nesting bug #90

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes pipeline nesting bug #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ function Expand-Archive
else
{
$createdItem = New-Item -Path $DestinationPath -ItemType Directory -Confirm:$isConfirm -Verbose:$isVerbose -ErrorAction Stop
if($createdItem -ne $null -and $createdItem.PSProvider.Name -ne "FileSystem")
if($null -ne $createdItem -and $createdItem.PSProvider.Name -ne "FileSystem")
{
Remove-Item "$DestinationPath" -Force -Recurse -ErrorAction SilentlyContinue
$errorMessage = ($LocalizedData.ExpandArchiveInValidDestinationPath -f $DestinationPath)
Expand Down Expand Up @@ -392,6 +392,9 @@ function Expand-Archive
if(!$isDestinationPathProvided)
{
$archiveFile = New-Object System.IO.FileInfo $resolvedSourcePaths
# When expanding multiple zip files via the pipeline, a deep hierarchy is created
# Resetting it here prevents that and the intuitive outcome then occurs
$resolvedDestinationPath = (Get-Location).ProviderPath
$resolvedDestinationPath = Join-Path -Path $resolvedDestinationPath -ChildPath $archiveFile.BaseName
$destinationPathExists = Test-Path -LiteralPath $resolvedDestinationPath -PathType Container

Expand All @@ -415,7 +418,7 @@ function Expand-Archive
{
# delete the expanded file/directory as the archive
# file was not completely expanded.
$expandedItems | % { Remove-Item "$_" -Force -Recurse }
$expandedItems | ForEach-Object { Remove-Item "$_" -Force -Recurse }
}
}
elseif ($PassThru -and $expandedItems.Count -gt 0)
Expand Down Expand Up @@ -786,7 +789,7 @@ function ZipArchiveHelper
}
}

if($entryToBeUpdated -ne $null)
if($null -ne $entryToBeUpdated)
{
$addItemtoArchiveFileMessage = ($LocalizedData.AddItemtoArchiveFile -f $currentFilePath)
$entryToBeUpdated.Delete()
Expand Down Expand Up @@ -1097,7 +1100,7 @@ function ExpandArchiveHelper
{
# The ExtractToFile() method doesn't handle whitespace correctly, strip whitespace which is consistent with how Explorer handles archives
# There is an edge case where an archive contains files whose only difference is whitespace, but this is uncommon and likely not legitimate
[string[]] $parts = $currentArchiveEntryPath.Split([System.IO.Path]::DirectorySeparatorChar) | % { $_.Trim() }
[string[]] $parts = $currentArchiveEntryPath.Split([System.IO.Path]::DirectorySeparatorChar) | ForEach-Object { $_.Trim() }
$currentArchiveEntryPath = [string]::Join([System.IO.Path]::DirectorySeparatorChar, $parts)

[System.IO.Compression.ZipFileExtensions]::ExtractToFile($currentArchiveEntry, $currentArchiveEntryPath, $false)
Expand Down