fix (decompress): Expand-7zipArchive only delete temp dir / $extractDir if it is empty

[o-l-a-v]

Description

decompress.ps1 deletes $extractDir even if it's not empty, which can cause applications to not work after installation.

More context and how I got to this solution in following comment:

• [Bug] Missing folders after installing packages making applications behave incorrectly #6011 (comment)

Motivation and Context

Closes #6011, ScoopInstaller/Extras#13324

How Has This Been

Tested locally with scoop install extras/tor-browser.

Checklist:

• I have read the Contributing Guide.
• I have ensured that I am targeting the develop branch.
• I have updated the documentation accordingly.
• I have updated the tests accordingly.
• I have added an entry in the CHANGELOG.

[o-l-a-v]

If tests should be updated (tell me): Should be sufficient to add a .7z to https://github.com/ScoopInstaller/Scoop/blob/develop/test/fixtures/decompress/TestCases.zip with:

root
├─ $PLUGINSDIR
└─ keep
   └─ keep
      └─  file.txt

Then check that "$DestinationPath\keep" exists?

[niheaven]

Could you please sign your commit? And the logic should be tweaked by only check if $ExtractDir is empty.

[o-l-a-v]

Could you please sign your commit?

I've never done that before, I'll see if I can figure how. 👍

And the logic should be tweaked by only check if $ExtractDir is empty.

Isn't that what I do? If no child items inside it => delete. It's also possible to use Test-Path -Path '<directory>\*', but I like using Get-ChildItem for readability.

I also kept $ExtractDir -replace '[\\/].*. I don't really see why it's neccessary, but I tried doing as little changes as possible.

---

I now see that the other Expand-*Archive functions suffers from the same bug. Or maybe they don't?

[niheaven]

For commit signing, you could ref https://docs.github.com/authentication/managing-commit-signature-verification

[niheaven]

Hmm, you should try to pass the tests now :)

[o-l-a-v]

I think I've fixed the test errors now @niheaven: Can't do Get-ChildItem if -Path does not exist.

[z-Fng]

While testing manifests, I happened to run into an issue here.

When the $ExtractDir depth is greater than or equal to three, like the one below ($ExtractDir : keep\sub\sub-sub), the folder 'keep' will not be removed. The return value of Get-ChildItem for folder 'keep' is always greater than 0 as there exists a sub-folder.

└─ keep
   └─ sub
      └─  sub-sub
         └─  empty
   └─ othersub

[o-l-a-v]

So one should look for files specifically? Add -File -Recurse to Get-ChildItem?

• https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.management/get-childitem?view=powershell-7.5#-file

[z-Fng]

Add -File -Recurse to Get-ChildItem?

When extraction is done, we cannot tell whether the folder is newly created or already existed.
If the folder already exists before extraction, even if it is an empty folder, we should not remove it.

Perhaps we could check if the folder exists recursively before 7-Zip actually starts extracting?

keep
   └─ sub
      └─  sub-sub

1. Check if the folder $DestinationPath\keep exists.
   • If it does not exist, we can safely remove $DestinationPath\keep.
   • If it does exist, proceed to step 2.
2. Check if the folder $DestinationPath\keep\sub exists.
   • If it does not exist, we can safely remove $DestinationPath\keep\sub.
   • If it does exist, proceed to step 3.
3. ...

[o-l-a-v]

Can you create a new issue with an example manifest where this problem occurs?

There is also this feature request which would make this logic unnecessary:

• [Feature] decompress - Extract to isolated temp directory outside $DestinationPath if -ExtractDir to avoid problems like #6011 #6093

[z-Fng]

Can you create a new issue with an example manifest where this problem occurs?

OK. I'm just about to do it.

There is also this feature request which would make this logic unnecessary

It would be even better if this new feature fixes the issue.

[z-Fng]

Can you create a new issue with an example manifest where this problem occurs?

• [Bug] Expand-7zipArchive won't remove top folder if $ExtractDir depth exceeds 2 #6515