Skip to content

Commit

Permalink
AU: 3 updated - calibre chromium thunderbird
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Jan 26, 2018
1 parent a1d0386 commit c3afd1a
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion automatic/calibre/calibre.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<metadata>
<id>calibre</id>
<title>Calibre</title>
<version>3.15.0</version>
<version>3.16.0</version>
<authors>Kovid Goyal</authors>
<owners>chocolatey, gep13</owners>
<summary>calibre is the one stop solution to all your e-book needs.</summary>
Expand Down
8 changes: 4 additions & 4 deletions automatic/calibre/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ location on <https://download.calibre-ebook.com/3.html>
and can be verified by doing the following:

1. Download the following:
32-Bit software: <https://download.calibre-ebook.com/3.15.0/calibre-3.15.0.msi>
64-Bit software: <https://download.calibre-ebook.com/3.15.0/calibre-64bit-3.15.0.msi>
32-Bit software: <https://download.calibre-ebook.com/3.16.0/calibre-3.16.0.msi>
64-Bit software: <https://download.calibre-ebook.com/3.16.0/calibre-64bit-3.16.0.msi>
2. Get the checksum using one of the following methods:
- Using powershell function 'Get-FileHash'
- Use chocolatey utility 'checksum.exe'
3. The checksums should match the following:

checksum type: sha256
checksum32: 6923CD73B8FEF2D47006C3BAC050B21E082E4F65232D4A279698BE929F71DAF0
checksum64: E0FEBCAF13A50EEAD8E8A198DFB9E280F8458DA8E2AC934F2C42B9FC701852C7
checksum32: BC812D75DE8F1FBE270C8299A439D011CAA1698E45CB7AC2BD33969C8D4D05B0
checksum64: 93EA139A7868DAE927F131FFE63EBC92C9824D31DCC15F951FB8B31A97E51694

The file 'LICENSE.txt' has been obtained from <https://github.com/kovidgoyal/calibre/blob/89c271759db5c71202251895f6793e4c1ec65ee6/LICENSE>
4 changes: 2 additions & 2 deletions automatic/calibre/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ $toolsPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$packageArgs = @{
packageName = $env:ChocolateyPackageName
fileType = 'MSI'
file = "$toolsPath\calibre-3.15.0.msi"
file64 = "$toolsPath\calibre-64bit-3.15.0.msi"
file = "$toolsPath\calibre-3.16.0.msi"
file64 = "$toolsPath\calibre-64bit-3.16.0.msi"
softwareName = 'calibre*'
silentArgs = '/quiet'
validExitCodes = @(0, 3010, 1641)
Expand Down
2 changes: 1 addition & 1 deletion automatic/chromium/chromium.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>chromium</id>
<version>66.0.3332.0-snapshots</version>
<version>66.0.3333.0-snapshots</version>
<title>Chromium Snapshots</title>
<owners>chocolatey</owners>
<authors>The Chromium Authors</authors>
Expand Down
8 changes: 4 additions & 4 deletions automatic/chromium/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ location on <https://github.com/henrypp/chromium/releases/> (the listed mirrors
and can be verified by doing the following:

1. Download the following:
32-Bit software: <https://storage.googleapis.com/chromium-browser-snapshots/Win/531810/mini_installer.exe>
64-Bit software: <https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/531802/mini_installer.exe>
32-Bit software: <https://storage.googleapis.com/chromium-browser-snapshots/Win/531988/mini_installer.exe>
64-Bit software: <https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/531988/mini_installer.exe>
2. Get the checksum using one of the following methods:
- Using powershell function 'Get-FileHash'
- Use chocolatey utility 'checksum.exe'
3. The checksums should match the following:

checksum type: sha256
checksum32: A18F6AC127666A636B63804063890428187F567B46454100585B671351A44D5A
checksum64: 03A730FC0D152FEF03CD11D0E2FA52913B861D338F23FBE0C4D737FB4EB72D41
checksum32: 0409512968637061A13D59E7094565561E1ED0C8BE7F29545FC5DD5F307B8F39
checksum64: 2507F3C0EDE049ADB47092C24FB9A0F07B7CD15189D6D4EC9C349E7FE07312B8

The file 'LICENSE.txt' has been obtained from <https://chromium.googlesource.com/chromium/src.git/+/master/LICENSE>
2 changes: 1 addition & 1 deletion automatic/chromium/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$scriptDir=$toolsDir = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
. (Join-Path $scriptDir 'helper.ps1')

$version = "66.0.3332.0-snapshots"
$version = "66.0.3333.0-snapshots"
$hive = "hkcu"
$chromium_string = "\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Chromium"
$Chromium = $hive + ":" + $chromium_string
Expand Down
2 changes: 1 addition & 1 deletion automatic/thunderbird/thunderbird.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>thunderbird</id>
<version>52.5.2</version>
<version>52.6.0</version>
<title>Mozilla Thunderbird</title>
<owners>chocolatey</owners>
<authors>Mozilla</authors>
Expand Down
118 changes: 59 additions & 59 deletions automatic/thunderbird/tools/LanguageChecksums.csv

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions automatic/thunderbird/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $toolsPath = Split-Path $MyInvocation.MyCommand.Definition
$packageName = 'thunderbird'
$softwareName = 'Mozilla Thunderbird'

$alreadyInstalled = (AlreadyInstalled -product $softwareName -version '52.5.2')
$alreadyInstalled = (AlreadyInstalled -product $softwareName -version '52.6.0')

if ($alreadyInstalled -and ($env:ChocolateyForce -ne $true)) {
Write-Output $(
Expand All @@ -26,7 +26,7 @@ if ($alreadyInstalled -and ($env:ChocolateyForce -ne $true)) {

Checksum = $checksums.Win32
ChecksumType = 'sha512'
Url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/52.5.2/win32/${locale}/Thunderbird%20Setup%2052.5.2.exe"
Url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/52.6.0/win32/${locale}/Thunderbird%20Setup%2052.6.0.exe"

silentArgs = '-ms'
validExitCodes = @(0)
Expand Down
4 changes: 2 additions & 2 deletions automatic/thunderbird/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 'Mozilla Thunderbird*'

if ($key.Count -eq 1) {
$key | % {
$key | ForEach-Object {
$packageArgs = @{
packageName = $packageName
fileType = 'exe'
Expand All @@ -26,5 +26,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)"}
}

0 comments on commit c3afd1a

Please sign in to comment.