Skip to content

Commit

Permalink
AU: 4 updated - nodejs php python python3
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Feb 1, 2018
1 parent 16cac2f commit ad41db4
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 28 deletions.
3 changes: 2 additions & 1 deletion automatic/nodejs/nodejs.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"9.1": "9.1.0",
"9.2": "9.2.1",
"9.3": "9.3.0",
"9.4": "9.4.0"
"9.4": "9.4.0",
"9.5": "9.5.0"
}
4 changes: 2 additions & 2 deletions automatic/nodejs/nodejs.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<metadata>
<id>nodejs</id>
<title>Node JS</title>
<version>9.4.0</version>
<version>9.5.0</version>
<authors>Node.js Foundation</authors>
<owners>chocolatey, Rob Reynolds</owners>
<summary>Node JS - Evented I/O for v8 JavaScript.</summary>
Expand All @@ -28,7 +28,7 @@ While this package now provides both **Current** and **LTS** releases of Node.js
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://cdn.rawgit.com/chocolatey/chocolatey-coreteampackages/ba5adf020e09cd0e51107206ef3ec390035a6e90/icons/nodejs.png</iconUrl>
<dependencies>
<dependency id="nodejs.install" version="[9.4.0]" />
<dependency id="nodejs.install" version="[9.5.0]" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions automatic/php/php.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"7.1": "7.1.13",
"7.1": "7.1.14",
"7.0": "7.0.27",
"5.6": "5.6.33",
"7.2": "7.2.1"
"7.2": "7.2.2"
}
4 changes: 2 additions & 2 deletions automatic/php/php.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<metadata>
<id>php</id>
<title>PHP (Hypertext Preprocessor)</title>
<version>7.2.1</version>
<version>7.2.2</version>
<authors>PHP Authors</authors>
<owners>chocolatey, Rob Reynolds</owners>
<summary>PHP – widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML.</summary>
Expand All @@ -24,7 +24,7 @@ For example: `--params '"/ThreadSafe ""/InstallDir:C:\PHP"""'`.
<tags>php development programming foss cross-platform admin</tags>
<licenseUrl>http://us.php.net/license/</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<releaseNotes>https://secure.php.net/ChangeLog-7.php#7.2.1</releaseNotes>
<releaseNotes>https://secure.php.net/ChangeLog-7.php#7.2.2</releaseNotes>
<iconUrl>https://cdn.rawgit.com/chocolatey/chocolatey-coreteampackages/4e147ce52b1a2a7ac522ffbce6d176f257de6ac1/icons/php.svg</iconUrl>
<bugTrackerUrl>https://bugs.php.net/</bugTrackerUrl>
<docsUrl>https://secure.php.net/docs.php</docsUrl>
Expand Down
4 changes: 2 additions & 2 deletions automatic/php/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ if (($installLocation -ne $newInstallLocation) -and (Test-Path "$installLocation

if (!(Test-Path $php_ini_path)) {
Write-Host 'Creating default php.ini'
cp $newInstallLocation/php.ini-production $php_ini_path
Copy-Item $newInstallLocation/php.ini-production $php_ini_path

Write-Host 'Configuring PHP extensions directory'
(gc $php_ini_path) -replace '; extension_dir = "ext"', 'extension_dir = "ext"' | sc $php_ini_path
(Get-Content $php_ini_path) -replace '; extension_dir = "ext"', 'extension_dir = "ext"' | Set-Content $php_ini_path
}

if (!$pp.ThreadSafe) { Write-Host 'Please make sure you have CGI installed in IIS for local hosting' }
4 changes: 2 additions & 2 deletions automatic/php/tools/downloadInfo.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
threadsafe|http://windows.php.net/downloads/releases/php-7.2.1-Win32-VC15-x86.zip|http://windows.php.net/downloads/releases/php-7.2.1-Win32-VC15-x64.zip|6174131fcd75e3f337f5952c788295e0b00e565c9ecb02703f2700310c9371b2|964b217fa423a971912f49017b279dad5f261be5c2f85fc5a49c109792031eb3
not-threadsafe|http://windows.php.net/downloads/releases/php-7.2.1-nts-Win32-VC15-x86.zip|http://windows.php.net/downloads/releases/php-7.2.1-nts-Win32-VC15-x64.zip|c48f102fa8f93824b4930af7100e3447a1a07ce6ae8e56d80e5fe21477bb29e5|b00e802bc023e617f6fcc05a6aad7ea80fadbc94a59bd794f69f4609c1e83cab
threadsafe|http://windows.php.net/downloads/releases/php-7.2.2-Win32-VC15-x86.zip|http://windows.php.net/downloads/releases/php-7.2.2-Win32-VC15-x64.zip|708f86b6d9c0daaa29efda77bb9827a8c503e2f30122bce0c2b4768ffe8ba164|107b851ee85017e073f58aeb52d47926a1abf7c2924ffff4d5121b4a0c8dcdee
not-threadsafe|http://windows.php.net/downloads/releases/php-7.2.2-nts-Win32-VC15-x86.zip|http://windows.php.net/downloads/releases/php-7.2.2-nts-Win32-VC15-x64.zip|d8705d87bb7f6e753c1a3d9e362279832719361fab33877a8419838e0b60a6ba|1eb64465593ca39360907c3b74afaad6b07425b68659dee86b830b73a98940d9
12 changes: 6 additions & 6 deletions automatic/php/tools/helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ function GetDownloadInfo {
Write-Debug "Reading CSV file from $downloadInfoFile"
$downloadInfo = Get-Content -Encoding UTF8 -Path $downloadInfoFile | ConvertFrom-Csv -Delimiter '|' -Header 'Type','URL32','URL64','Checksum32','Checksum64'
if ($parameters.ThreadSafe) {
$downloadInfo | ? { $_.Type -eq 'threadsafe' } | select -first 1
$downloadInfo | Where-Object { $_.Type -eq 'threadsafe' } | Select-Object -first 1
} else {
$downloadInfo | ? { $_.Type -eq 'not-threadsafe' } | select -first 1
$downloadInfo | Where-Object { $_.Type -eq 'not-threadsafe' } | Select-Object -first 1
}
}

Expand All @@ -40,7 +40,7 @@ function GetInstallLocation {
Write-Debug "Checking for uninstall text document in $libDirectory"

if (Test-Path "$libDirectory\*.txt") {
$txtContent = Get-Content -Encoding UTF8 "$libDirectory\*.txt" | select -first 1
$txtContent = Get-Content -Encoding UTF8 "$libDirectory\*.txt" | Select-Object -first 1
$index = $txtContent.LastIndexOf('\')
if ($index -gt 0) {
return $txtContent.Substring(0, $index)
Expand All @@ -62,7 +62,7 @@ function GetNewInstallLocation {
return $pp.InstallDir
}

$toolsLocation = Get-BinRoot
$toolsLocation = Get-ToolsLocation
return "$toolsLocation\{0}{1}" -f $PackageName, ($Version -replace '\.').Substring(0,2)
}

Expand All @@ -72,8 +72,8 @@ function UninstallPackage {
[string]$packageName
)
if (Test-Path "$libDirectory\*.txt") {
$txtFile = Resolve-Path "$libDirectory\*.txt" | select -first 1
$fileName = ($txtFile -split '\\' | select -last 1).TrimEnd('.txt')
$txtFile = Resolve-Path "$libDirectory\*.txt" | Select-Object -first 1
$fileName = ($txtFile -split '\\' | Select-Object -last 1).TrimEnd('.txt')
Uninstall-ChocolateyZipPackage -PackageName $packageName -ZipFileName $fileName
if (Test-Path $txtFile) {
Remove-Item -Force -ea 0 $txtFile
Expand Down
2 changes: 1 addition & 1 deletion automatic/python/python.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"3.4": "3.4.4.20180111",
"3.5": "3.5.4",
"3.6": "3.6.4.20180116",
"3.7": "3.7.0-a4-20180116"
"3.7": "3.7.0-b1"
}
4 changes: 2 additions & 2 deletions automatic/python/python.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>python</id>
<version>3.7.0-a4-20180116</version>
<version>3.7.0-b1</version>
<title>Python</title>
<owners>chocolatey</owners>
<authors>Python Software Foundation</authors>
Expand All @@ -24,7 +24,7 @@ Python is a programming language that lets you work more quickly and integrate y
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/python</packageSourceUrl>
<projectSourceUrl>https://www.python.org/downloads/source</projectSourceUrl>
<dependencies>
<dependency id="python3" version="[3.7.0-a4-20180116]" />
<dependency id="python3" version="[3.7.0-b1]" />
</dependencies>
<licenseUrl>https://www.python.org/download/releases/3.4.0/license</licenseUrl>
</metadata>
Expand Down
8 changes: 4 additions & 4 deletions automatic/python3/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: https://www.python.org/ftp/python/3.7.0/python-3.7.0a4.exe
x64: https://www.python.org/ftp/python/3.7.0/python-3.7.0a4-amd64.exe
x32: https://www.python.org/ftp/python/3.7.0/python-3.7.0b1.exe
x64: https://www.python.org/ftp/python/3.7.0/python-3.7.0b1-amd64.exe

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: 448E006A39CCC2A4E4D4B639C85E4C878181303821D41FE2F2F2C3E5A97D09E7
checksum64: 5CF220CFDCEEC2C1CCB05AEDC7D7EE60A959FB2E851922D7768EC70448F52251
checksum32: 753913546EB92DE645007468BB1666E40A006EB8A5CD221D3D60C1354338A886
checksum64: CC58C46E128353CA4F5CDC61A7E7BE6814B3A26CECB9596DD4EDB856198328A7

File 'license.txt' is obtained from:
https://www.python.org/download/releases/3.4.0/license/
2 changes: 1 addition & 1 deletion automatic/python3/python3.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"3.4": "3.4.4.20180111",
"3.5": "3.5.4",
"3.6": "3.6.4.20180116",
"3.7": "3.7.0-a4-20180116"
"3.7": "3.7.0-b1"
}
2 changes: 1 addition & 1 deletion automatic/python3/python3.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>python3</id>
<version>3.7.0-a4-20180116</version>
<version>3.7.0-b1</version>
<title>Python 3.x</title>
<owners>chocolatey</owners>
<authors>Python Software Foundation</authors>
Expand Down
4 changes: 2 additions & 2 deletions automatic/python3/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ if ( $pp.InstallDir ) {
$packageArgs = @{
packageName = 'python3'
fileType = 'exe'
file = "$toolsPath\python-3.7.0a4.exe"
file64 = "$toolsPath\python-3.7.0a4-amd64.exe"
file = "$toolsPath\python-3.7.0b1.exe"
file64 = "$toolsPath\python-3.7.0b1-amd64.exe"
silentArgs = '/quiet InstallAllUsers=1 PrependPath=1 TargetDir="{0}"' -f $installDir
validExitCodes = @(0)
softwareName = 'Python*'
Expand Down

0 comments on commit ad41db4

Please sign in to comment.