Skip to content

Commit

Permalink
AU: 1 updated - p4merge.install
Browse files Browse the repository at this point in the history
  • Loading branch information
tunisiano187 committed Aug 11, 2020
1 parent a6ceae9 commit df8b018
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
22 changes: 15 additions & 7 deletions automatic/p4merge.install/P4Merge.install.nuspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>P4Merge</id>
<version>0.0</version>
<owners>hans0</owners>
<packageSourceUrl>https://github.com/hansnull/chocolatey-p4merge-package</packageSourceUrl>
<iconUrl>https://github.com/alanstevens/ChocoPackages/raw/master/P4Merge/p4merge.png</iconUrl>
<id>p4merge.install</id>
<version>20.1</version>
<owners>tunisiano</owners>
<packageSourceUrl>https://github.com/tunisiano187/Chocolatey-packages/tree/master/automatic/p4merge.install</packageSourceUrl>
<iconUrl>https://cdn.jsdelivr.net/gh/tunisiano187/Chocolatey-packages@844f2a7fa61f639af9ca6245f8e767e868e3300d/icons/p4merge.png</iconUrl>
<title>P4Merge, the Perforce Visual Merge Tool</title>
<authors>Perforce Software, Inc.</authors>
<projectUrl>https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge</projectUrl>
Expand All @@ -16,7 +16,15 @@
<docsUrl>https://filehost.perforce.com/perforce/r20.1/doc/manuals/p4merge.pdf</docsUrl>
<tags>freeware p4merge diff merge admin</tags>
<summary>P4Merge is an excellent, free diff and merge tool.</summary>
<description>P4Merge is a visual diff tool that displays the differences between file versions and helps you to resolve conflicts and merge competing versions into one.</description>
<description><![CDATA[## P4Merge
P4Merge is a visual diff tool that displays the differences between file versions and helps you
to resolve conflicts and merge competing versions into one.
### Package-specific issue
If this package isn't up-to-date for some days, [Create an issue](https://github.com/tunisiano187/Chocolatey-packages/issues/new/choose)
Support me on [Patreon](https://www.patreon.com/bePatron?u=39585820)
]]></description>
<releaseNotes>#### Software
https://www.perforce.com/perforce/doc.current/user/p4vmergenotes.txt

Expand Down
2 changes: 1 addition & 1 deletion automatic/p4merge.install/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ to resolve conflicts and merge competing versions into one.
### Package-specific issue
If this package isn't up-to-date for some days, [Create an issue](https://github.com/tunisiano187/Chocolatey-packages/issues/new/choose)

Support me on [Patreon](https://www.patreon.com/bePatron?u=39585820)
Support me on [Patreon](https://www.patreon.com/bePatron?u=39585820)
6 changes: 3 additions & 3 deletions automatic/p4merge.install/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

$packageName = $env:ChocolateyPackageName
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$url = 'https://filehost.perforce.com/perforce/r19.2/bin.ntx86/p4vinst.exe'
$url = 'https://cdist2.perforce.com/perforce/r20.1/bin.ntx86/p4vinst.exe'
$url64 = 'https://filehost.perforce.com/perforce/r19.2/bin.ntx64/p4vinst64.exe'
$checksum = ''
$checksumType = ''
$checksum = '5b7ce5100cbdd7cfb5732d28d39beec9ca9f9e4a72fa52b3c5f26cc683cfac4e'
$checksumType = 'sha256'
$checksum64 = ''
$checksumType64 = ''

Expand Down

0 comments on commit df8b018

Please sign in to comment.