Skip to content

Commit

Permalink
AU: 1 updated - meld
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Jan 18, 2019
1 parent 2bf2998 commit 29d8abf
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 17 deletions.
2 changes: 1 addition & 1 deletion automatic/meld/Changelog.md
@@ -1,5 +1,5 @@
# ![Meld Changelog](https://img.shields.io/badge/Meld-Package%20Changelog-blue.svg?style=for-the-badge)

## UPCOMING
## Version: 3.18.3 (2019-01-18)

- Taken over as a new maintainer of the meld package (original maintainer: @dtgm)
2 changes: 1 addition & 1 deletion automatic/meld/Readme.md
@@ -1,4 +1,4 @@
# [<img src="https://cdn.jsdelivr.net/gh/AdmiringWorm/chocolatey-packages@305ebe5b15634985b7fff0b99cfa337a3cb1fe48/icons/meld.png" height="48" width="48" /> ![Meld](https://img.shields.io/chocolatey/v/meld.svg?label=Meld&style=for-the-badge)](https://chocolatey.org/packages/meld)
# [<img src="https://cdn.jsdelivr.net/gh/AdmiringWorm/chocolatey-packages@0e467f051e98f601b2cb42337c8f31ecc18f924c/icons/meld.png" height="48" width="48" /> ![Meld](https://img.shields.io/chocolatey/v/meld.svg?label=Meld&style=for-the-badge)](https://chocolatey.org/packages/meld)

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems.

Expand Down
6 changes: 3 additions & 3 deletions automatic/meld/legal/VERIFICATION.txt
Expand Up @@ -6,13 +6,13 @@ The embedded software have been downloaded from the listed download
location on <http://meldmerge.org/>
and can be verified by doing the following:

1. Download the following <>
1. Download the following <https://download.gnome.org/binaries/win32/meld/3.20/Meld-3.20.0-mingw.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:
checksum:
checksum type: sha256
checksum: 9F36AC1BBA647EB53AE20864C02C2F8B17467973FC71E1700ABD9B18272BC8CF

The file 'LICENSE.txt' has been obtained from <https://gitlab.gnome.org/GNOME/meld/raw/master/COPYING>
5 changes: 4 additions & 1 deletion automatic/meld/meld.json
@@ -1 +1,4 @@
{}
{
"3.18": "3.18.3",
"3.20": "3.20.0"
}
19 changes: 14 additions & 5 deletions automatic/meld/meld.nuspec
Expand Up @@ -3,13 +3,13 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>meld</id>
<version>3.16.2</version>
<version>3.20.0</version>
<packageSourceUrl>https://github.com/AdmiringWorm/chocolatey-packages/tree/master/automatic/meld</packageSourceUrl>
<owners>AdmiringWorm, dtgm</owners>
<title>Meld</title>
<authors>Kai Willadsen</authors>
<projectUrl>https://meldmerge.org/</projectUrl>
<iconUrl>https://cdn.jsdelivr.net/gh/AdmiringWorm/chocolatey-packages@305ebe5b15634985b7fff0b99cfa337a3cb1fe48/icons/meld.png</iconUrl>
<iconUrl>https://cdn.jsdelivr.net/gh/AdmiringWorm/chocolatey-packages@0e467f051e98f601b2cb42337c8f31ecc18f924c/icons/meld.png</iconUrl>
<copyright>Copyright © 2011-2012 Kai Willadsen</copyright>
<licenseUrl>https://gitlab.gnome.org/GNOME/meld/blob/master/COPYING</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -20,10 +20,19 @@
<tags>meld compare diff merge admin foss cross-platform</tags>
<summary>Visual diff and merge file/folder tool</summary>
<!-- Do not touch the description here in the nuspec file. Description is imported during update from the Readme.md file -->
<description>Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically).
You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial.
<description><![CDATA[Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems.
Written with Python and GTK. While in theory meld could be compiled for Windows and OS X currently there is no download for these platforms so we do not list it as cross platform.</description>
Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.
## Features
- Two- and three-way comparison of files and directories
- File comparisons update as you type
- Auto-merge mode and actions on change blocks help make merges easier
- Visualisations make it easier to compare your files
- Supports Git, Bazaar, Mercurial, Subversion, etc.
- ...and [more](https://meldmerge.org/features.html)
]]></description>
<releaseNotes>
[Software Changelog](https://meldmerge.org/news.html)
[Package Changelog](https://github.com/AdmiringWorm/chocolatey-packages/blob/master/automatic/meld/Changelog.md)
Expand Down
6 changes: 3 additions & 3 deletions automatic/meld/tools/chocolateyInstall.ps1
Expand Up @@ -5,12 +5,12 @@ $toolsPath = Split-Path -parent $MyInvocation.MyCommand.Definition
$packageArgs = @{
packageName = $env:ChocolateyPackageName
fileType = 'msi'
file = "$toolsPath\"
softwareName = 'meld*'
file = "$toolsPath\Meld-3.20.0-mingw.msi"
softwareName = 'Meld'
silentArgs = "/qn /norestart /l*v `"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
validExitCodes = @(0, 2010, 1641)
}

Install-ChocolateyInstallPackage @packageArgs

ls $toolsPath\*.msi | % { rm $_ -ea 0; if (Test-Path $_) { sc "$_.ignore" } }
Get-ChildItem $toolsPath\*.msi | ForEach-Object { Remove-Item $_ -ea 0; if (Test-Path $_) { Set-Content "$_.ignore" } }
6 changes: 3 additions & 3 deletions automatic/meld/tools/chocolateyUninstall.ps1
Expand Up @@ -2,7 +2,7 @@

$packageArgs = @{
packageName = $env:ChocolateyPackageName
softwareName = 'meld*'
softwareName = 'Meld'
fileType = 'msi'
silentArgs = "/qn /norestart /l*v `"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
validExitCodes = @(@(0, 2010, 1641))
Expand All @@ -13,7 +13,7 @@ $uninstalled = $false
[array]$key = Get-UninstallRegistryKey @packageArgs

if ($key.Count -eq 1) {
$key | % {
$key | ForEach-Object {
$packageArgs['silentArgs'] = "$($_.PSChildName) $($packageArgs['silentArgs'])"
$packageArgs['file'] = ''

Expand All @@ -27,5 +27,5 @@ elseif ($key.Count -gt 1) {
Write-Warning "$($key.Count) matches found!"
Write-Warning "To prevent accidental data loss, no programs will be uninstalled."
Write-Warning "Please alert the package maintainer that the following keys were matched:"
$key | % { Write-Warning "- $($_.DisplayName)" }
$key | ForEach-Object { Write-Warning "- $($_.DisplayName)" }
}

0 comments on commit 29d8abf

Please sign in to comment.