fix(decompress): '$ExtractDir' removed original extract file by accid…

…ent (ScoopInstaller#3470)
rmnscnce · Jun 24, 2019 · a882c4f · a882c4f
1 parent 2fafcb8
commit a882c4f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/decompress.ps1 b/lib/decompress.ps1
@@ -141,7 +141,7 @@ function Expand-MsiArchive {
         movedir "$DestinationPath\SourceDir\$ExtractDir" $DestinationPath | Out-Null
         Remove-Item "$DestinationPath\SourceDir" -Recurse -Force
     } elseif ($ExtractDir) {
-        Get-ChildItem $DestinationPath -Exclude $ExtractDir | Remove-Item -Recurse -Force
+        Get-ChildItem $DestinationPath -Exclude $ExtractDir, $Path | Remove-Item -Recurse -Force
         movedir "$DestinationPath\$ExtractDir" $DestinationPath | Out-Null
     } elseif (Test-Path "$DestinationPath\SourceDir") {
         movedir "$DestinationPath\SourceDir" $DestinationPath | Out-Null
@@ -236,7 +236,7 @@ function Expand-ZipArchive {
         Microsoft.PowerShell.Archive\Expand-Archive -Path $Path -DestinationPath $DestinationPath -Force
     }
     if ($ExtractDir) {
-        Get-ChildItem $DestinationPath -Exclude $ExtractDir | Remove-Item -Recurse -Force
+        Get-ChildItem $DestinationPath -Exclude $ExtractDir, $Path | Remove-Item -Recurse -Force
         movedir "$DestinationPath\$ExtractDir" $DestinationPath | Out-Null
     }
     if ($Removal) {
@@ -276,7 +276,7 @@ function Expand-DarkArchive {
         Remove-Item $LogPath -Force
     }
     if ($ExtractDir) {
-        Get-ChildItem $DestinationPath -Exclude $ExtractDir | Remove-Item -Recurse -Force
+        Get-ChildItem $DestinationPath -Exclude $ExtractDir, $Path | Remove-Item -Recurse -Force
         movedir "$DestinationPath\$ExtractDir" $DestinationPath | Out-Null
     }
     if ($Removal) {