Skip to content

Commit

Permalink
AU: 5 updated - 7zip 7zip.install 7zip.portable GoogleChrome smartftp
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Jan 24, 2018
1 parent 7281cad commit bf49186
Show file tree
Hide file tree
Showing 16 changed files with 56 additions and 50 deletions.
3 changes: 2 additions & 1 deletion automatic/7zip.install/7zip.install.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"stable": "16.4.0.20170506"
"stable": "16.4.0.20170506",
"pre": "18.0-beta"
}
13 changes: 7 additions & 6 deletions automatic/7zip.install/7zip.install.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<metadata>
<id>7zip.install</id>
<title>7-Zip (Install)</title>
<version>16.4.0.20170506</version>
<version>18.0-beta</version>
<authors>Igor Pavlov</authors>
<owners>chocolatey,Rob Reynolds</owners>
<summary>7-Zip is a file archiver with a high compression ratio.</summary>
<description>7-Zip is a file archiver with a high compression ratio.
<description><![CDATA[7-Zip is a file archiver with a high compression ratio.
## Features
- High compression ratio in [7z format](http://www.7-zip.org/7z.html) with **LZMA** and **LZMA2** compression
- Supported formats:
- Packing / unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP and WIM
- Unpacking only: AR, ARJ, CAB, CHM, CPIO, CramFS, DMG, EXT, FAT, GPT, HFS, IHEX, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, QCOW2, RAR, RPM, SquashFS, UDF, UEFI, VDI, VHD, VMDK, WIM, XAR and Z.
- Packing / unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP and WIM
- Unpacking only: AR, ARJ, CAB, CHM, CPIO, CramFS, DMG, EXT, FAT, GPT, HFS, IHEX, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, QCOW2, RAR, RPM, SquashFS, UDF, UEFI, VDI, VHD, VMDK, WIM, XAR and Z.
- For ZIP and GZIP formats, **7-Zip** provides a compression ratio that is 2-10 % better than the ratio provided by PKZip and WinZip
- Strong AES-256 encryption in 7z and ZIP formats
- Self-extracting capability for 7z format
Expand All @@ -28,8 +28,9 @@
## Notes
- The installer for 7-Zip is known to close the explorer process.
This means you may lose current work. If it doesn't automatically restart explorer, type `explorer` on the command shell to restart it.
</description>
This means you may lose current work. If it doesn't automatically restart explorer, type `explorer` on the command shell to restart it.
]]></description>
<projectUrl>http://www.7-zip.org/</projectUrl>
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/7zip.install</packageSourceUrl>
<tags>7zip zip archiver admin cross-platform cli foss</tags>
Expand Down
8 changes: 4 additions & 4 deletions automatic/7zip.install/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ The installer have been downloaded from their official download link listed on <
and can be verified like this:

1. Download the following installers:
32-Bit: <http://www.7-zip.org/a/7z1604.exe>
64-Bit: <http://www.7-zip.org/a/7z1604-x64.exe>
32-Bit: <http://www.7-zip.org/a/7z1800.exe>
64-Bit: <http://www.7-zip.org/a/7z1800-x64.exe>
2. You can use one of the following methods to obtain the checksum
- Use powershell function 'Get-Filehash'
- Use chocolatey utility 'checksum.exe'

checksum type:
checksum32: DBB2B11DEA9F4432291E2CBEFE14EBE05E021940E983A37E113600EEE55DAA95
checksum64: 9BB4DC4FAB2A2A45C15723C259DC2F7313C89A5AC55AB7C3F76BBA26EDC8BCAA
checksum32: FA24678D8FFC2A9116C4C66F1D1C5D55FA580F48C81CA7CC4B3A652887B7020B
checksum64: BEC98C25F375149B974248EABF7ABDB52AF686666EC1772467457D4848D973A7

File 'LICENSE.txt' is obtained from <http://www.7-zip.org/license.txt>
8 changes: 4 additions & 4 deletions automatic/7zip.install/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$ErrorActionPreference = 'Stop'

$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$filePath = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne $true) {
Write-Host "Installing 64 bit version" ; gi $toolsDir\*_x64.exe }
else { Write-Host "Installing 32 bit version" ; gi $toolsDir\*_x32.exe }
$filePath = if ((Get-OSArchitectureWidth 64) -and $env:chocolateyForceX86 -ne $true) {
Write-Host "Installing 64 bit version" ; Get-Item $toolsDir\*_x64.exe }
else { Write-Host "Installing 32 bit version" ; Get-Item $toolsDir\*_x32.exe }

$packageArgs = @{
packageName = '7zip.install'
Expand All @@ -14,7 +14,7 @@ $packageArgs = @{
validExitCodes = @(0)
}
Install-ChocolateyInstallPackage @packageArgs
rm $toolsDir\*.exe -ea 0 -force
Remove-Item $toolsDir\*.exe -ea 0 -force

$installLocation = Get-AppInstallLocation $packageArgs.softwareName
if (!$installLocation) { Write-Warning "Can't find 7zip install location"; return }
Expand Down
4 changes: 2 additions & 2 deletions automatic/7zip.install/tools/chocolateyUninstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $uninstalled = $false
[array]$key = Get-UninstallRegistryKey -SoftwareName '7-zip*'

if ($key.Count -eq 1) {
$key | % {
$key | ForEach-Object {
$packageArgs = @{
packageName = $packageName
fileType = 'EXE'
Expand All @@ -23,5 +23,5 @@ if ($key.Count -eq 1) {
Write-Warning "$($key.Count) matches found!"
Write-Warning "To prevent accidental data loss, no programs will be uninstalled."
Write-Warning "Please alert package maintainer the following keys were matched:"
$key | % {Write-Warning "- $($_.DisplayName)"}
$key | ForEach-Object {Write-Warning "- $($_.DisplayName)"}
}
3 changes: 2 additions & 1 deletion automatic/7zip.portable/7zip.portable.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"stable": "16.4.0.20170506"
"stable": "16.4.0.20170506",
"pre": "18.0-beta"
}
11 changes: 6 additions & 5 deletions automatic/7zip.portable/7zip.portable.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@
<metadata>
<id>7zip.portable</id>
<title>7-Zip (Portable, CommandLine)</title>
<version>16.4</version>
<version>18.0-beta</version>
<authors>Igor Pavlov</authors>
<owners>chocolatey,Rob Reynolds</owners>
<summary>7-Zip is a file archiver with a high compression ratio.</summary>
<description>7-Zip is a file archiver with a high compression ratio.
<description><![CDATA[7-Zip is a file archiver with a high compression ratio.
## Features
- High compression ratio in [7z format](http://www.7-zip.org/7z.html) with **LZMA** and **LZMA2** compression
- Supported formats:
- Packing / unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP and WIM
- Unpacking only: AR, ARJ, CAB, CHM, CPIO, CramFS, DMG, EXT, FAT, GPT, HFS, IHEX, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, QCOW2, RAR, RPM, SquashFS, UDF, UEFI, VDI, VHD, VMDK, WIM, XAR and Z.
- Packing / unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP and WIM
- Unpacking only: AR, ARJ, CAB, CHM, CPIO, CramFS, DMG, EXT, FAT, GPT, HFS, IHEX, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, QCOW2, RAR, RPM, SquashFS, UDF, UEFI, VDI, VHD, VMDK, WIM, XAR and Z.
- For ZIP and GZIP formats, **7-Zip** provides a compression ratio that is 2-10 % better than the ratio provided by PKZip and WinZip
- Strong AES-256 encryption in 7z and ZIP formats
- Self-extracting capability for 7z format
- Powerful command line version
- Localizations for 87 languages
</description>
]]></description>
<projectUrl>http://www.7-zip.org/</projectUrl>
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/7zip.portable</packageSourceUrl>
<tags>7zip zip archiver foss</tags>
Expand Down
12 changes: 6 additions & 6 deletions automatic/7zip.portable/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ The installer have been downloaded from their official download link listed on <
and can be verified like this:

1. Download the following installers:
32-Bit: <http://www.7-zip.org/a/7z1604.exe>
64-Bit: <http://www.7-zip.org/a/7z1604-x64.exe>
Extra : <http://www.7-zip.org/a/7z1700-extra.7z>
32-Bit: <http://www.7-zip.org/a/7z1800.exe>
64-Bit: <http://www.7-zip.org/a/7z1800-x64.exe>
Extra : <http://www.7-zip.org/a/7z1800-extra.7z>
2. You can use one of the following methods to obtain the checksum
- Use powershell function 'Get-Filehash'
- Use chocolatey utility 'checksum.exe'

checksum type: sha256
checksum32 : DBB2B11DEA9F4432291E2CBEFE14EBE05E021940E983A37E113600EEE55DAA95
checksum64 : 9BB4DC4FAB2A2A45C15723C259DC2F7313C89A5AC55AB7C3F76BBA26EDC8BCAA
checksumExtra: 626430DE3675D1744120191D002AEBC096B1385EC6949CF9E75EBCA8D98E3894
checksum32 : FA24678D8FFC2A9116C4C66F1D1C5D55FA580F48C81CA7CC4B3A652887B7020B
checksum64 : BEC98C25F375149B974248EABF7ABDB52AF686666EC1772467457D4848D973A7
checksumExtra: 3BCCD9B0E5D4152EB0251EAF88443204839B5C62C741377C2CCC42996908A64F

File 'LICENSE.txt' is obtained from <http://www.7-zip.org/license.txt>
4 changes: 2 additions & 2 deletions automatic/7zip.portable/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $filePathExtra = "$toolsDir\7zip_extra.7z"
$packageArgs = @{
packageName = '7zip.portable'
destination = "$toolsDir"
file = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne $true) {
file = if ((Get-OSArchitectureWidth 64) -and $env:chocolateyForceX86 -ne $true) {
Write-Host "Installing 64 bit version" ; $filePath64
} else {
Write-Host "Installing 32 bit version" ; $filePath32
Expand All @@ -24,7 +24,7 @@ Get-ChocolateyUnzip @packageArgs

Remove-Item -Path "$toolsDir\Uninstall.exe",$filePath32,$filePath64,$filePathExtra -Force -ea 0

if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne $true) {
if ((Get-OSArchitectureWidth 64) -and $env:chocolateyForceX86 -ne $true) {
#generate ignore for 7za.exe and let x64 version pick up and shim
New-Item "$($packageArgs.destination)\7za.exe.ignore" -Type file -Force | Out-Null
} else {
Expand Down
3 changes: 2 additions & 1 deletion automatic/7zip/7zip.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"stable": "16.4.0.20170506"
"stable": "16.4.0.20170506",
"pre": "18.0-beta"
}
15 changes: 8 additions & 7 deletions automatic/7zip/7zip.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<metadata>
<id>7zip</id>
<title>7-Zip</title>
<version>16.4.0.20170506</version>
<version>18.0-beta</version>
<authors>Igor Pavlov</authors>
<owners>chocolatey,Rob Reynolds</owners>
<summary>7-Zip is a file archiver with a high compression ratio.</summary>
<description>7-Zip is a file archiver with a high compression ratio.
<description><![CDATA[7-Zip is a file archiver with a high compression ratio.
## Features
- High compression ratio in [7z format](http://www.7-zip.org/7z.html) with **LZMA** and **LZMA2** compression
- Supported formats:
- Packing / unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP and WIM
- Unpacking only: AR, ARJ, CAB, CHM, CPIO, CramFS, DMG, EXT, FAT, GPT, HFS, IHEX, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, QCOW2, RAR, RPM, SquashFS, UDF, UEFI, VDI, VHD, VMDK, WIM, XAR and Z.
- Packing / unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP and WIM
- Unpacking only: AR, ARJ, CAB, CHM, CPIO, CramFS, DMG, EXT, FAT, GPT, HFS, IHEX, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, QCOW2, RAR, RPM, SquashFS, UDF, UEFI, VDI, VHD, VMDK, WIM, XAR and Z.
- For ZIP and GZIP formats, **7-Zip** provides a compression ratio that is 2-10 % better than the ratio provided by PKZip and WinZip
- Strong AES-256 encryption in 7z and ZIP formats
- Self-extracting capability for 7z format
Expand All @@ -26,8 +26,9 @@
## Notes
- The installer for 7-Zip is known to close the explorer process.
This means you may lose current work. If it doesn't automatically restart explorer, type `explorer` on the command shell to restart it.
</description>
This means you may lose current work. If it doesn't automatically restart explorer, type `explorer` on the command shell to restart it.
]]></description>
<projectUrl>http://www.7-zip.org/</projectUrl>
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/7zip</packageSourceUrl>
<tags>7zip zip archiver admin foss</tags>
Expand All @@ -39,7 +40,7 @@
<bugTrackerUrl>https://sourceforge.net/p/sevenzip/_list/tickets?source=navbar</bugTrackerUrl>
<releaseNotes>http://www.7-zip.org/history.txt</releaseNotes>
<dependencies>
<dependency id="7zip.install" version="[16.4.0.20170506]" />
<dependency id="7zip.install" version="[18.0-beta]" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion automatic/googlechrome/googlechrome.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>GoogleChrome</id>
<version>63.0.3239.132</version>
<version>64.0.3282.11900</version>
<title>Google Chrome</title>
<owners>chocolatey</owners>
<authors>Google Inc.</authors>
Expand Down
8 changes: 4 additions & 4 deletions automatic/googlechrome/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$toolsPath = Split-Path $MyInvocation.MyCommand.Definition
. $toolsPath\helpers.ps1

$version = '63.0.3239.132'
$version = '64.0.3282.119'
if ($version -eq (Get-ChromeVersion)) {
Write-Host "Google Chrome $version is already installed."
return
Expand All @@ -12,13 +12,13 @@ $packageArgs = @{
fileType = 'MSI'
url = 'https://dl.google.com/tag/s/dl/chrome/install/googlechromestandaloneenterprise.msi'
url64bit = 'https://dl.google.com/tag/s/dl/chrome/install/googlechromestandaloneenterprise64.msi'
checksum = 'cbc37e1eea6da3b87d6824dd34054e0ef4259dc83a6abf3fc3cf174aaeddb9dc'
checksum64 = '2cd66cc8be56d94ce65724437b5f8cd1bf915c78137d8c2dfb9dd01e4f3d77c1'
checksum = 'c0c95e4bff3438be8c7758ad73e21af455fe40f672fe8f3a23f839146b732b99'
checksum64 = '25f634c485cdd6ef6e039b16922568b5bc6bca79efeb7cb2c1603c7751115960'
checksumType = 'sha256'
checksumType64 = 'sha256'
silentArgs = "/quiet /norestart /l*v `"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
validExitCodes = @(0)
}

if (Get-Chrome32bitInstalled) { 'url64bit', 'checksum64', 'checksumType64' | % { $packageArgs.Remove($_) } }
if (Get-Chrome32bitInstalled) { 'url64bit', 'checksum64', 'checksumType64' | ForEach-Object { $packageArgs.Remove($_) } }
Install-ChocolateyPackage @packageArgs
6 changes: 3 additions & 3 deletions automatic/googlechrome/tools/helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# as we don't need to make any checks in that case.
if (!(Test-Path $registryPath) -or $env:ChocolateyForceX86 -eq $true) { return }

$32bitInstalled = gi $registryPath | % {
$32bitInstalled = Get-Item $registryPath | ForEach-Object {
if ((Get-ItemProperty $_.pspath).ap -match 'arch_x86$') { return $true }
}
if ($32bitInstalled) {
return $32bitInstalled
}

$installLocation = Get-UninstallRegistryKey 'Google Chrome' | % { $_.InstallSource }
$installLocation = Get-UninstallRegistryKey 'Google Chrome' | ForEach-Object { $_.InstallSource }
if ($installLocation) {
return Test-Path "$installLocation\nacl_irt_x86_32.nexe"
} else {
Expand All @@ -23,7 +23,7 @@ function Get-ChromeVersion() {
$root = 'HKLM:\SOFTWARE\Google\Update\Clients'
$root64 = 'HKLM:\SOFTWARE\Wow6432Node\Google\Update\Clients'
foreach ($r in $root,$root64) {
$gcb = gci $r -ea 0 | ? { (gp $_.PSPath).name -eq 'Google Chrome' }
$gcb = Get-ChildItem $r -ea 0 | Where-Object { (Get-ItemProperty $_.PSPath).name -eq 'Google Chrome' }
if ($gcb) { return $gcb.GetValue('pv') }
}
}
2 changes: 1 addition & 1 deletion automatic/smartftp/smartftp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<id>smartftp</id>
<title>SmartFTP</title>
<owners>chocolatey</owners>
<version>9.0.2544.0</version>
<version>9.0.2545.0</version>
<authors>SmartSoft</authors>
<summary>FTP, FTPS, SFTP, HTTP, Amazon S3, WebDAV, Google Drive, Google Cloud Storage, Microsoft OneDrive, Telnet, Terminal client.</summary>
<description><![CDATA[SmartFTP is a fast and reliable FTP, FTPS, SFTP, HTTP, Amazon S3, WebDAV, Google Drive, Google Cloud Storage, Microsoft OneDrive, Backblaze B2, Telnet, Terminal client with lots of features and a modern user interface.
Expand Down
4 changes: 2 additions & 2 deletions automatic/smartftp/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ $packageArgs = @{
fileType = 'msi'
url = 'https://www.smartftp.com/get/SmartFTP86.msi'
url64bit = 'https://www.smartftp.com/get/SmartFTP64.msi'
checksum = '6659d02adf716a27a8f0ac5e897a605e6148d8442768d566090daeb7f270c4cc'
checksum64 = '470652e2d309f704449e86263d7ad3d85c03e2211e8c55065fb28be9882d35d1'
checksum = '833b45e4cbb8732fc783929d3b33db8d0d3d4e90b14617552f3116e5009aa9f9'
checksum64 = '52bbb146cbe8f6eb81dcfa6fb5eede2e2e83d3998ab73a2eaee3b9e2a84f7d60'
checksumType = 'sha256'
checksumType64 = 'sha256'
silentArgs = '/quiet'
Expand Down

0 comments on commit bf49186

Please sign in to comment.