Skip to content

Commit

Permalink
AU: 5 updated - cmake.install cmake.portable msys2 quiterss sysinternals
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Jun 1, 2018
1 parent 2035332 commit 64cd110
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion automatic/cmake.install/cmake.install.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"3.8": "3.8.2",
"3.9": "3.9.6",
"3.10": "3.10.3",
"3.11": "3.11.2"
"3.11": "3.11.3"
}
2 changes: 1 addition & 1 deletion automatic/cmake.install/cmake.install.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>cmake.install</id>
<version>3.11.2</version>
<version>3.11.3</version>
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/cmake.install</packageSourceUrl>
<owners>chocolatey, dtgm</owners>
<title>CMake (Install)</title>
Expand Down
8 changes: 4 additions & 4 deletions automatic/cmake.install/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ location on <https://cmake.org/download/>
and can be verified by doing the following:

1. Download the following:
32-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.2-win32-x86.msi>
64-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.2-win64-x64.msi>
32-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.3-win32-x86.msi>
64-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.3-win64-x64.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: B1940E9B745799121259598698D564BAC43359718BAEA067ACBFFFED6F1E8D81
checksum64: C1AB51D36AD80DB4D91970C50453219FDE0558346787A3CBBF92C6B23D684FF0
checksum32: C2D88A8F4E7E49A8A96A18EA1D3CDFCA23FEDA3FB7D7C2094955E42553F54EA5
checksum64: A2B465AE197EB7F87779BB955DE1A302DBF95F8F8D260AC72195FF20E5003445

The file 'LICENSE.txt' has been obtained from <https://gitlab.kitware.com/cmake/cmake/blob/master/Copyright.txt>
4 changes: 2 additions & 2 deletions automatic/cmake.install/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\cmake-3.11.2-win32-x86.msi"
file64 = "$toolsPath\cmake-3.11.2-win64-x64.msi"
file = "$toolsPath\cmake-3.11.3-win32-x86.msi"
file64 = "$toolsPath\cmake-3.11.3-win64-x64.msi"
softwareName = 'CMake'
silentArgs = "/qn /norestart /l*v `"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
validExitCodes = @(0, 3010, 1641)
Expand Down
2 changes: 1 addition & 1 deletion automatic/cmake.portable/cmake.portable.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"3.8": "3.8.2",
"3.9": "3.9.6",
"3.10": "3.10.3",
"3.11": "3.11.2"
"3.11": "3.11.3"
}
2 changes: 1 addition & 1 deletion automatic/cmake.portable/cmake.portable.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>cmake.portable</id>
<version>3.11.2</version>
<version>3.11.3</version>
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/cmake.portable</packageSourceUrl>
<owners>chocolatey, dtgm</owners>
<title>CMake (Portable)</title>
Expand Down
8 changes: 4 additions & 4 deletions automatic/cmake.portable/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ location on <https://cmake.org/download/>
and can be verified by doing the following:

1. Download the following:
32-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.2-win32-x86.zip>
64-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.2-win64-x64.zip>
32-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.3-win32-x86.zip>
64-Bit software: <https://cmake.org/files/v3.11/cmake-3.11.3-win64-x64.zip>
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: 0D8BF9BF56519733A09BD9F39423514ADFBB6513ED4E0508A3222E31F1F8264D
checksum64: 8C998FD7C278169E44F19F546DE2C9A275E2ACC8DBF858F0112A02242DFBBCD2
checksum32: D444DA334688451E467F72E7B3617900C4E39CB6DCE44CB2AD650B0E7CED02D3
checksum64: D275D176D7A249C6156B260D19A8049A2032C7E3F1BDE04FCF13CE9C7CA895CD

The file 'LICENSE.txt' has been obtained from <https://gitlab.kitware.com/cmake/cmake/blob/master/Copyright.txt>
4 changes: 2 additions & 2 deletions automatic/cmake.portable/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ $toolsPath = Split-Path -parent $MyInvocation.MyCommand.Definition

$packageArgs = @{
packageName = $env:ChocolateyPackageName
file = "$toolsPath\cmake-3.11.2-win32-x86.zip"
file64 = "$toolsPath\cmake-3.11.2-win64-x64.zip"
file = "$toolsPath\cmake-3.11.3-win32-x86.zip"
file64 = "$toolsPath\cmake-3.11.3-win64-x64.zip"
destination = $toolsPath
}

Expand Down
8 changes: 4 additions & 4 deletions automatic/msys2/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ Package can be verified like this:

1. Go to

x32: http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz
x64: http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz
x32: http://repo.msys2.org/distrib/i686/msys2-base-i686-20180531.tar.xz
x64: http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz

to download the installer.

2. You can use one of the following methods to obtain the SHA256 checksum:
- Use powershell function 'Get-FileHash'
- Use Chocolatey utility 'checksum.exe'

checksum32: 8BAFD3D52F5A51528A8671C1CAE5591B36086D6EA5B1E76E17E390965CF6768F
checksum64: BB1F1A0B35B3D96BF9C15092DA8CE969A84A134F7B08811292FBC9D84D48C65D
checksum32: 8EF5B18C4C91F3F2394823F1981BABDEE78A945836B2625F091EC934B1A37D32
checksum64: 4E799B5C3EFCF9EFCB84923656B7BCFF16F75A666911ABD6620EA8E5E1E9870C

File 'LICENSE.txt' is obtained from:
https://raw.githubusercontent.com/Alexpux/MSYS2-packages/master/LICENSE
Expand Down
10 changes: 5 additions & 5 deletions automatic/msys2/msys2.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>msys2</id>
<version>20161025.0.0</version>
<version>20180531.0.0</version>
<title>MSYS2</title>
<authors>Alexpux, martell, mingwandroid, elieux, renatosilva, niXman</authors>
<owners>chocolatey, userzimmermann, petemounce</owners>
Expand All @@ -28,11 +28,11 @@ It features a package management system to provide easy installation of packages
### Ruby integration
This package can be used with [ruby](https://chocolatey.org/packages/ruby) package to provide native building environment for gems.
This package can be used with [ruby](https://chocolatey.org/packages/ruby) package to provide native building environment for gems.
- The ruby installer comes with `ridk` function which offers interactive GUI installation wizard of msys2 and hence [can't be used unattended](https://github.com/oneclick/rubyinstaller2/issues/79) (`ridk install 1`).
- Its system update is the same as initialization done with this package (`ridk install 2`).
- Ruby installer offers unattended setup of MSYS2 and MINGW development toolchain (`ridk install 3`).
- The ruby installer comes with `ridk` function which offers interactive GUI installation wizard of msys2 and hence [can't be used unattended](https://github.com/oneclick/rubyinstaller2/issues/79) (`ridk install 1`).
- Its system update is the same as initialization done with this package (`ridk install 2`).
- Ruby installer offers unattended setup of MSYS2 and MINGW development toolchain (`ridk install 3`).
You can also just install the msys2 package without system update and use `ridk` afterwards:
Expand Down
22 changes: 11 additions & 11 deletions automatic/msys2/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ErrorActionPreference = 'Stop'

$toolsDir = Split-Path $MyInvocation.MyCommand.Definition
$is64 = (Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true'
$is64 = (Get-OSArchitectureWidth 64) -and $env:chocolateyForceX86 -ne 'true'
$dir_name = if ($is64) { 'msys64' } else { 'msys32' }

$pp = Get-PackageParameters
Expand All @@ -13,19 +13,19 @@ if (!(Test-Path $install_dir)) {
Write-Host "Installing to:" $install_dir
$packageArgs = @{
PackageName = $Env:ChocolateyPackageName
FileFullPath = gi $toolsDir\*-i686*
FileFullPath64 = gi $toolsDir\*-x86_64*
FileFullPath = Get-Item $toolsDir\*-i686*
FileFullPath64 = Get-Item $toolsDir\*-x86_64*
Destination = $install_dir
}
Get-ChocolateyUnzip @packageArgs
rm $toolsPath\*.xz -ea 0
Remove-Item $toolsPath\*.xz -ea 0

$tarFile = gi "$install_dir\*.tar"
$tarFile = Get-Item "$install_dir\*.tar"
Get-ChocolateyUnzip $tarFile $install_dir
rm "$install_dir\*.tar" -ea 0
$tardir = gi "$install_dir\msys*"
Remove-Item "$install_dir\*.tar" -ea 0
$tardir = Get-Item "$install_dir\msys*"
if ([String]::IsNullOrWhiteSpace($tardir)) { throw "Can't find msys* directory from tar archive" }
mv $tardir\* $install_dir; rm $tardir
Move-Item $tardir\* $install_dir; Remove-Item $tardir
} else { Write-Host "'$install_dir' already exists and will only be updated." }

if ($proxy = Get-EffectiveProxy) {
Expand All @@ -42,12 +42,12 @@ if (!$pp.NoPath) { Install-ChocolateyPath $pp.InstallDir }
if (!$pp.NoUpdate) {
Write-Host "Repeating system update until there are no more updates or max 5 iterations"
$ErrorActionPreference = 'Continue' #otherwise bash warnings will exit
sal bash "$install_dir\usr\bin\bash.exe"
Set-Alias bash "$install_dir\usr\bin\bash.exe"
while (!$done) {
Write-Host "`n================= SYSTEM UPDATE $((++$i)) =================`n"
bash -lc 'pacman --noconfirm -Syuu | tee /update.log'
$done = (gc $install_dir\update.log) -match 'there is nothing to do' | Measure | % { $_.Count -eq 2 }
$done = (Get-Content $install_dir\update.log) -match 'there is nothing to do' | Measure-Object | ForEach-Object { $_.Count -eq 2 }
$done = $done -or ($i -ge 5)
}
rm $install_dir\update.log -ea 0
Remove-Item $install_dir\update.log -ea 0
}
4 changes: 2 additions & 2 deletions automatic/quiterss/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ in verifying that this package's contents are trustworthy.
The installer have been downloaded from the alternative sourceforge mirror listed on https://quiterss.org/en/download
and can be verified like this:

1. Download the following installer: https://quiterss.org/files/0.18.10/QuiteRSS-0.18.10-Setup.exe
1. Download the following installer: https://quiterss.org/files/0.18.11/QuiteRSS-0.18.11-Setup.exe

2. You can use one of the following methods to obtain the checksums:
- Use powershell function 'Get-Filehash'
- Use chocolatey utility 'checksum.exe'

checksum: 664B380FB33FC8C38E35A05E300D972B82F37FD44CB7D1F3341539FD6D325CCB
checksum: ABA43382EB633E983D35B8AC17F5834A0C7796385DA1D3F3B8B99DD7EC43D86D
checksum type: sha256

File 'LICENSE.txt' is obtained from https://github.com/QuiteRSS/quiterss/blob/master/COPYING
2 changes: 1 addition & 1 deletion automatic/quiterss/quiterss.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>quiterss</id>
<title>QuiteRSS</title>
<version>0.18.10</version>
<version>0.18.11</version>
<owners>chocolatey,dtgm</owners>
<summary>QuiteRSS is a free news feeds reader written on Qt/C++.</summary>
<description><![CDATA[QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader.
Expand Down
2 changes: 1 addition & 1 deletion automatic/quiterss/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"

$packageArgs = @{
file = "$toolsDir\QuiteRSS-0.18.10-Setup.exe"
file = "$toolsDir\QuiteRSS-0.18.11-Setup.exe"
fileType = 'exe'
packageName = 'quiterss'
softwareName = 'QuiteRSS'
Expand Down
2 changes: 1 addition & 1 deletion automatic/sysinternals/sysinternals.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<metadata>
<id>sysinternals</id>
<title>Sysinternals</title>
<version>2018.5.14</version>
<version>2018.5.31</version>
<authors>Mark Russinovich, Bryce Cogswell</authors>
<owners>chocolatey, Rob Reynolds</owners>
<summary>Sysinternals - utilities to help you manage, troubleshoot and diagnose your Windows systems and applications.</summary>
Expand Down
2 changes: 1 addition & 1 deletion automatic/sysinternals/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Write-Host "Sysinternals Suite is going to be installed in '$installDir'"
$packageArgs = @{
packageName = 'sysinternals'
url = 'https://download.sysinternals.com/files/SysinternalsSuite.zip'
checksum = '2c527c42998a1bef2c67d48180a8f83a5dc1b309037b36dd35ab4ac9e5fdecec'
checksum = 'c6cd0795f6f5754ad2ceab576862e5142b8829b9e5004d5081822bfd3ba0ac10'
checksumType = 'sha256'
unzipLocation = $installDir
}
Expand Down

0 comments on commit 64cd110

Please sign in to comment.