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

(MODULES-4210) Do not use com unzip in PS 5+ #56

Merged
merged 1 commit into from
Dec 15, 2016
+8 −4
Merged

(MODULES-4210) Do not use com unzip in PS 5+ #56

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
12 changes: 8 additions & 4 deletions templates/InstallChocolatey.ps1.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,14 @@ if ($unzipMethod -eq '7zip') {
Write-Output "Extracting $file to $tempDir..."
Start-Process "$7zaExe" -ArgumentList "x -o`"$tempDir`" -y `"$file`"" -Wait -NoNewWindow
} else {
$shellApplication = new-object -com shell.application
$zipPackage = $shellApplication.NameSpace($file)
$destinationFolder = $shellApplication.NameSpace($tempDir)
$destinationFolder.CopyHere($zipPackage.Items(),0x10)
if ($PSVersionTable.PSversion.major -lt 5) {
$shellApplication = new-object -com shell.application
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also change this part while we at it:

Add-Type -AssemblyName System.IO.Compression.FileSystem
[System.IO.Compression.ZipFile]::ExtractToDirectory($file, $tempDir)

I use this in many Puppet / Powershell scripts in lack of Expand-Archive

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is likely only in .NET Framework 4.x forward, but if you are in PowerShell v4+ you are guaranteed to be on at least v4. With 5 you have a guarantee of at least 4.5.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually never tested the assembly part on PS < 4, but it was a new feature in .NET2.0:
https://msdn.microsoft.com/en-us/library/system.io.compression(v=vs.80).aspx

The Expand-Archive - commandlet is a new (and long anticipated) feature of PS 5.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No dice - needs at least 4.5 for ZipFile - https://msdn.microsoft.com/en-us/library/system.io.compression.zipfile(v=vs.110).aspx

$zipPackage = $shellApplication.NameSpace($file)
$destinationFolder = $shellApplication.NameSpace($tempDir)
$destinationFolder.CopyHere($zipPackage.Items(),0x10)
} else {
Expand-Archive -Path "$file" -DestinationPath "$tempDir" -Force
}
}

# call chocolatey install
Expand Down