From 747f58d6d864f31ed8b1d4304de686a7e8bef305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8C=C3=A1bera?= Date: Sat, 9 Jan 2021 15:51:37 +0100 Subject: [PATCH] ffmpeg-nightly-shared-vulkan: Update to version 100592 format [n-o]* --- bucket/ffmpeg-nightly-shared-vulkan.json | 8 ++-- bucket/nasm.json | 26 +++++------ bucket/neko.json | 6 +-- bucket/nero-aac.json | 10 ++-- bucket/netcat.json | 20 ++++---- bucket/nginx.json | 8 ++-- bucket/ngrok.json | 14 +++--- bucket/nircmd.json | 6 +-- bucket/nmap-portable.json | 30 ++++++------ bucket/nmap.json | 8 ++-- bucket/node-chakracore.json | 38 +++++++-------- bucket/nomad.json | 6 +-- bucket/ntop.json | 2 +- bucket/nuget.json | 6 +-- bucket/nunit-console.json | 14 +++--- .../nunit-extension-nunit-project-loader.json | 6 +-- bucket/nunit-extension-nunit-v2-driver.json | 6 +-- ...unit-extension-nunit-v2-result-writer.json | 6 +-- ...nit-extension-teamcity-event-listener.json | 6 +-- bucket/nunit-extension-vs-project-loader.json | 6 +-- bucket/nvm.json | 46 +++++++++---------- bucket/octave.json | 6 +-- bucket/openresty.json | 20 ++++---- bucket/openshift-origin-client.json | 8 ++-- bucket/openssh.json | 38 +++++++-------- bucket/openssl.json | 11 ++--- bucket/optipng.json | 4 +- bucket/opus-tools.json | 2 +- bucket/osslsigncode.json | 8 ++-- 29 files changed, 186 insertions(+), 189 deletions(-) diff --git a/bucket/ffmpeg-nightly-shared-vulkan.json b/bucket/ffmpeg-nightly-shared-vulkan.json index 2cefe1603e..5170e80afd 100644 --- a/bucket/ffmpeg-nightly-shared-vulkan.json +++ b/bucket/ffmpeg-nightly-shared-vulkan.json @@ -1,13 +1,13 @@ { - "version": "100581", + "version": "100592", "description": "A complete, cross-platform solution to record, convert and stream audio and video.", "homepage": "https://ffmpeg.org", "license": "GPL-3.0-or-later", "architecture": { "64bit": { - "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2021-01-08-12-53/ffmpeg-N-100581-ga454a0c14f-win64-gpl-shared-vulkan.zip", - "hash": "9cc180c85a25fd70c88846799356eea338aa331a98283c44cef26beb523722a0", - "extract_dir": "ffmpeg-N-100581-ga454a0c14f-win64-gpl-shared-vulkan" + "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2021-01-09-12-40/ffmpeg-N-100592-g42ee3898c8-win64-gpl-shared-vulkan.zip", + "hash": "e8733df92385409ef228903663a9fd58af970305dfe988da86783899d222eb96", + "extract_dir": "ffmpeg-N-100592-g42ee3898c8-win64-gpl-shared-vulkan" } }, "bin": [ diff --git a/bucket/nasm.json b/bucket/nasm.json index 05e6405c47..de1f74ac80 100644 --- a/bucket/nasm.json +++ b/bucket/nasm.json @@ -1,9 +1,8 @@ { - "homepage": "https://www.nasm.us", - "license": "BSD-2-Clause", "version": "2.15.05", "description": "80x86 and x86-64 assembler designed for portability and modularity.", - "extract_dir": "nasm-2.15.05", + "homepage": "https://www.nasm.us", + "license": "BSD-2-Clause", "architecture": { "64bit": { "url": "https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-win64.zip", @@ -14,22 +13,23 @@ "hash": "258c7d1076e435511cf2fdf94e2281eadbdb9e3003fd57f356f446e2bce3119e" } }, + "extract_dir": "nasm-2.15.05", "bin": [ "nasm.exe", "ndisasm.exe", - "rdoff/ldrdf.exe", - "rdoff/rdf2bin.exe", - "rdoff/rdf2com.exe", - "rdoff/rdf2ihx.exe", - "rdoff/rdf2ith.exe", - "rdoff/rdf2srec.exe", - "rdoff/rdfdump.exe", - "rdoff/rdflib.exe", - "rdoff/rdx.exe" + "rdoff\\ldrdf.exe", + "rdoff\\rdf2bin.exe", + "rdoff\\rdf2com.exe", + "rdoff\\rdf2ihx.exe", + "rdoff\\rdf2ith.exe", + "rdoff\\rdf2srec.exe", + "rdoff\\rdfdump.exe", + "rdoff\\rdflib.exe", + "rdoff\\rdx.exe" ], "checkver": { "url": "https://nasm.us/doc/nasmdocc.html", - "re": "version ([\\d.]+)" + "regex": "version ([\\d.]+)" }, "autoupdate": { "architecture": { diff --git a/bucket/neko.json b/bucket/neko.json index 8f32d9bd87..4667777fa4 100644 --- a/bucket/neko.json +++ b/bucket/neko.json @@ -1,7 +1,7 @@ { - "homepage": "https://nekovm.org", - "description": "A high-level dynamically typed programming language", "version": "2.3.0", + "description": "A high-level dynamically typed programming language", + "homepage": "https://nekovm.org", "license": "MIT", "architecture": { "64bit": { @@ -21,10 +21,10 @@ "nekoml.exe", "nekotools.exe" ], + "env_add_path": ".", "env_set": { "NEKO_INSTPATH": "$dir" }, - "env_add_path": ".", "checkver": { "github": "https://github.com/HaxeFoundation/neko", "regex": "neko-([\\d.]+)-win64" diff --git a/bucket/nero-aac.json b/bucket/nero-aac.json index 54b34045c0..ac9d7d1b50 100644 --- a/bucket/nero-aac.json +++ b/bucket/nero-aac.json @@ -1,19 +1,19 @@ { - "homepage": "https://www.videohelp.com/software/Nero-AAC-Codec", "version": "1.5.4.0", "description": "Nero Digital AAC Encoder (Command Line Tools)", + "homepage": "https://www.videohelp.com/software/Nero-AAC-Codec", "license": { "identifier": "Freeware", "url": "https://www.nero.com/eng/corp-legal/end-user-agreement.php" }, + "suggest": { + "LameXP": "extras/lamexp" + }, "url": "https://www.videohelp.com/download/NeroAACCodec-1.5.4.zip", "hash": "e0496ad856e2803001a59985368d21b22f4fbdd55589c7f313d6040cefff648b", "bin": [ "win32\\neroAacEnc.exe", "win32\\neroAacDec.exe", "win32\\neroAacTag.exe" - ], - "suggest": { - "LameXP": "extras/lamexp" - } + ] } diff --git a/bucket/netcat.json b/bucket/netcat.json index 9d70ed254c..51a3f1fce0 100644 --- a/bucket/netcat.json +++ b/bucket/netcat.json @@ -1,8 +1,11 @@ { + "version": "1.12", + "description": "Read and write from/to network connections", + "homepage": "https://eternallybored.org/misc/netcat/", + "license": "GPL-2.0-only", + "url": "https://eternallybored.org/misc/netcat/netcat-win32-1.12.zip", + "hash": "413f85a1dbac60ab5516742d76beff4f4da22b8ef1a424f10f36ec77e6d274b1", "architecture": { - "32bit": { - "bin": "nc.exe" - }, "64bit": { "bin": [ [ @@ -10,15 +13,12 @@ "nc" ] ] + }, + "32bit": { + "bin": "nc.exe" } }, "autoupdate": { "url": "https://eternallybored.org/misc/netcat/netcat-win32-$version.zip" - }, - "description": "Read and write from/to network connections", - "hash": "413f85a1dbac60ab5516742d76beff4f4da22b8ef1a424f10f36ec77e6d274b1", - "homepage": "https://eternallybored.org/misc/netcat/", - "license": "GPL-2.0-only", - "url": "https://eternallybored.org/misc/netcat/netcat-win32-1.12.zip", - "version": "1.12" + } } diff --git a/bucket/nginx.json b/bucket/nginx.json index fcc5a97495..a69963bce5 100644 --- a/bucket/nginx.json +++ b/bucket/nginx.json @@ -1,8 +1,9 @@ { - "homepage": "https://nginx.org", - "description": "An HTTP and reverse proxy server, a mail proxy server, and a generic TCP/UDP proxy server.", "version": "1.19.6", + "description": "An HTTP and reverse proxy server, a mail proxy server, and a generic TCP/UDP proxy server.", + "homepage": "https://nginx.org", "license": "BSD-2-Clause", + "notes": "To use the correct configuration run 'nginx -p \"$env:NGINX_HOME\"' or 'nginx -p \"%NGINX_HOME%\"'", "url": "https://nginx.org/download/nginx-1.19.6.zip", "hash": "ce19383460413b7982abf9e7416eeb2077b73f4b433c42406eb7d9bfd0c08953", "extract_dir": "nginx-1.19.6", @@ -16,10 +17,9 @@ "logs", "temp" ], - "notes": "To use the correct configuration run 'nginx -p \"$env:NGINX_HOME\"' or 'nginx -p \"%NGINX_HOME%\"'", "checkver": { "url": "https://nginx.org/en/CHANGES", - "re": "Changes with nginx ([\\d.]+)" + "regex": "Changes with nginx ([\\d.]+)" }, "autoupdate": { "url": "https://nginx.org/download/nginx-$version.zip", diff --git a/bucket/ngrok.json b/bucket/ngrok.json index 87f7a3040b..834c0ee312 100644 --- a/bucket/ngrok.json +++ b/bucket/ngrok.json @@ -1,7 +1,7 @@ { - "homepage": "https://ngrok.com/", - "description": "Spend more time programming. One command for an instant, secure URL to your localhost server through any NAT or firewall.", "version": "2.3.35", + "description": "Spend more time programming. One command for an instant, secure URL to your localhost server through any NAT or firewall.", + "homepage": "https://ngrok.com/", "license": { "identifier": "Shareware", "url": "https://ngrok.com/tos" @@ -19,13 +19,9 @@ "bin": "ngrok.exe", "checkver": { "url": "https://dl.equinox.io/ngrok/ngrok/stable/archive", - "re": "/a/(?\\w+)/ngrok-([\\d.]+)-windows-amd64.zip(?:.|\\n)+?/a/(?\\w+)/ngrok-([\\d.]+)-windows-386.zip" + "regex": "/a/(?\\w+)/ngrok-([\\d.]+)-windows-amd64.zip(?:.|\\n)+?/a/(?\\w+)/ngrok-([\\d.]+)-windows-386.zip" }, "autoupdate": { - "hash": { - "url": "https://dl.equinox.io/ngrok/ngrok/stable/archive", - "regex": "$url(?:.|\\n)+?value=\"(\\w+)" - }, "architecture": { "64bit": { "url": "https://bin.equinox.io/a/$matchHash64bit/ngrok-$version-windows-amd64.zip" @@ -33,6 +29,10 @@ "32bit": { "url": "https://bin.equinox.io/a/$matchHash32bit/ngrok-$version-windows-386.zip" } + }, + "hash": { + "url": "https://dl.equinox.io/ngrok/ngrok/stable/archive", + "regex": "$url(?:.|\\n)+?value=\"(\\w+)" } } } diff --git a/bucket/nircmd.json b/bucket/nircmd.json index d2b4b13512..071c817016 100644 --- a/bucket/nircmd.json +++ b/bucket/nircmd.json @@ -1,7 +1,7 @@ { "version": "2.86", - "homepage": "https://www.nirsoft.net/utils/nircmd.html", "description": "Execute various system wide tasks.", + "homepage": "https://www.nirsoft.net/utils/nircmd.html", "license": "Freeware", "architecture": { "64bit": { @@ -14,9 +14,7 @@ } }, "bin": "nircmdc.exe", - "checkver": { - "re": "NirCmd v([\\d\\.]+)" - }, + "checkver": "NirCmd v([\\d.]+)", "autoupdate": { "architecture": { "64bit": { diff --git a/bucket/nmap-portable.json b/bucket/nmap-portable.json index 3c36c81168..16b4b3ab6c 100644 --- a/bucket/nmap-portable.json +++ b/bucket/nmap-portable.json @@ -1,16 +1,26 @@ { - "homepage": "https://nmap.org", - "description": "Network exploration and security auditing utility.", "version": "7.91", + "description": "Network exploration and security auditing utility.", + "homepage": "https://nmap.org", "license": { "identifier": "GPL-2.0-only", "url": "https://github.com/nmap/nmap/blob/master/COPYING" }, - "url": "https://nmap.org/dist/nmap-7.91-setup.exe#/dl.7z", - "hash": "c4683097a2615252eeddab06c54872efb14c2ee2da8997b1c73844e582081a79", + "notes": [ + "Please install 'Npcap' by manually running '$dir\\npcap-oem.exe'!", + "Please import the network performance improvements by running 'regedt32 \"$dir\\nmap_performance.reg\"'", + "See: https://nmap.org/book/inst-windows.html" + ], "suggest": { "Visual C++ Redist 2008": "extras/vcredist2008" }, + "url": "https://nmap.org/dist/nmap-7.91-setup.exe#/dl.7z", + "hash": "c4683097a2615252eeddab06c54872efb14c2ee2da8997b1c73844e582081a79", + "pre_install": [ + "Get-ChildItem \"$dir\\`$PLUGINSDIR\\npcap-*-oem.exe\" | Select-Object -First 1 | Rename-Item -NewName 'npcap-oem.exe'", + "Move-Item \"$dir\\`$PLUGINSDIR\\npcap-oem.exe\" \"$dir\"", + "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall.exe\" -Recurse" + ], "bin": [ "nmap.exe", "ncat.exe", @@ -18,25 +28,15 @@ "zenmap.exe", "nping.exe" ], - "pre_install": [ - "Get-ChildItem \"$dir\\`$PLUGINSDIR\\npcap-*-oem.exe\" | Select-Object -First 1 | Rename-Item -NewName 'npcap-oem.exe'", - "Move-Item \"$dir\\`$PLUGINSDIR\\npcap-oem.exe\" \"$dir\"", - "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall.exe\" -Recurse" - ], "shortcuts": [ [ "zenmap.exe", "Nmap - Zenmap GUI" ] ], - "notes": [ - "Please install 'Npcap' by manually running '$dir\\npcap-oem.exe'!", - "Please import the network performance improvements by running 'regedt32 \"$dir\\nmap_performance.reg\"'", - "See: https://nmap.org/book/inst-windows.html" - ], "checkver": { "url": "https://nmap.org/download.html", - "regex": "nmap-([\\d.]+)-setup.exe" + "regex": "nmap-([\\d.]+)-setup\\.exe" }, "autoupdate": { "url": "https://nmap.org/dist/nmap-$version-setup.exe#/dl.7z" diff --git a/bucket/nmap.json b/bucket/nmap.json index 75db0a1005..44ba573996 100644 --- a/bucket/nmap.json +++ b/bucket/nmap.json @@ -1,11 +1,12 @@ { - "homepage": "https://nmap.org", - "description": "Network exploration and security auditing utility. (includes Npcap)", "version": "7.91", + "description": "Network exploration and security auditing utility. (includes Npcap)", + "homepage": "https://nmap.org", "license": { "identifier": "GPL-2.0-only", "url": "https://github.com/nmap/nmap/blob/master/COPYING" }, + "notes": "'Npcap' has been installed automatically.", "url": "https://nmap.org/dist/nmap-7.91-setup.exe", "hash": "c4683097a2615252eeddab06c54872efb14c2ee2da8997b1c73844e582081a79", "installer": { @@ -31,10 +32,9 @@ "Nmap - Zenmap GUI" ] ], - "notes": "'Npcap' has been installed automatically.", "checkver": { "url": "https://nmap.org/download.html", - "regex": "nmap-([\\d.]+)-setup.exe" + "regex": "nmap-([\\d.]+)-setup\\.exe" }, "autoupdate": { "url": "https://nmap.org/dist/nmap-$version-setup.exe" diff --git a/bucket/node-chakracore.json b/bucket/node-chakracore.json index 038a23462c..8cad0c1348 100644 --- a/bucket/node-chakracore.json +++ b/bucket/node-chakracore.json @@ -1,49 +1,49 @@ { - "homepage": "https://github.com/nodejs/node-chakracore", - "description": "Node.js with ChakraCore JavaScript engine (Microsoft Edge) support.", "version": "10.13.0", + "description": "Node.js with ChakraCore JavaScript engine (Microsoft Edge) support.", + "homepage": "https://github.com/nodejs/node-chakracore", "license": "MIT", "architecture": { - "32bit": { - "url": "https://nodejs.org/download/chakracore-release/v10.13.0/node-v10.13.0-win-x86.7z", - "hash": "09ebe6d83ac19d20dbcc7b3960d69d1dc4b2e955e0e730e715c729f3ee5a4774", - "extract_dir": "node-v10.13.0-win-x86" - }, "64bit": { "url": "https://nodejs.org/download/chakracore-release/v10.13.0/node-v10.13.0-win-x64.7z", "hash": "25eacbf5008c498a90739167efd8661f89bc13a36a2e4ea2a351ea1180e11a1e", "extract_dir": "node-v10.13.0-win-x64" + }, + "32bit": { + "url": "https://nodejs.org/download/chakracore-release/v10.13.0/node-v10.13.0-win-x86.7z", + "hash": "09ebe6d83ac19d20dbcc7b3960d69d1dc4b2e955e0e730e715c729f3ee5a4774", + "extract_dir": "node-v10.13.0-win-x86" } }, - "persist": [ - "bin", - "cache" + "post_install": [ + "# Set npm prefix to install modules inside bin and npm cache so they persist", + "Set-Content -Value \"prefix=$persist_dir\\bin`ncache=$persist_dir\\cache\" -Path \"$dir\\node_modules\\npm\\npmrc\"" ], "env_add_path": [ "bin", "." ], - "post_install": [ - "# Set npm prefix to install modules inside bin and npm cache so they persist", - "Set-Content -Value \"prefix=$persist_dir\\bin`ncache=$persist_dir\\cache\" -Path \"$dir\\node_modules\\npm\\npmrc\"" + "persist": [ + "bin", + "cache" ], "checkver": { "url": "https://nodejs.org/download/chakracore-release/index.json", - "re": "v([\\d.]+)" + "regex": "v([\\d.]+)" }, "autoupdate": { "architecture": { - "32bit": { - "url": "https://nodejs.org/download/chakracore-release/v$version/node-v$version-win-x86.7z", - "extract_dir": "node-v$version-win-x86" - }, "64bit": { "url": "https://nodejs.org/download/chakracore-release/v$version/node-v$version-win-x64.7z", "extract_dir": "node-v$version-win-x64" + }, + "32bit": { + "url": "https://nodejs.org/download/chakracore-release/v$version/node-v$version-win-x86.7z", + "extract_dir": "node-v$version-win-x86" } }, "hash": { - "url": "https://nodejs.org/download/chakracore-release/v$version/SHASUMS256.txt" + "url": "$baseurl/SHASUMS256.txt" } } } diff --git a/bucket/nomad.json b/bucket/nomad.json index bf12105b42..1792ee9d80 100644 --- a/bucket/nomad.json +++ b/bucket/nomad.json @@ -1,8 +1,8 @@ { + "version": "1.0.1", + "description": "Easy-to-use, flexible, and performant workload orchestrator that can deploy a mix of microservice, batch, containerized, and non-containerized applications.", "homepage": "https://www.nomadproject.io", "license": "MPL-2.0", - "description": "Easy-to-use, flexible, and performant workload orchestrator that can deploy a mix of microservice, batch, containerized, and non-containerized applications.", - "version": "1.0.1", "architecture": { "64bit": { "url": "https://releases.hashicorp.com/nomad/1.0.1/nomad_1.0.1_windows_amd64.zip", @@ -16,7 +16,7 @@ "bin": "nomad.exe", "checkver": { "url": "https://releases.hashicorp.com/nomad/", - "re": "nomad_([\\d.]+)" + "regex": "nomad_([\\d.]+)" }, "autoupdate": { "architecture": { diff --git a/bucket/ntop.json b/bucket/ntop.json index 3e924a57bb..5371f294ce 100644 --- a/bucket/ntop.json +++ b/bucket/ntop.json @@ -1,7 +1,7 @@ { + "version": "0.3.4", "description": "htop-like system-monitor with Vi-emulation for Windows", "homepage": "https://github.com/Nuke928/NTop", - "version": "0.3.4", "license": "GPL-3.0-only", "url": "https://github.com/Nuke928/NTop/releases/download/v0.3.4/ntop.exe", "hash": "67aadf4b033de1acaee2d84be4a296c14baa8288706e116435221733e93f9f50", diff --git a/bucket/nuget.json b/bucket/nuget.json index 2053586b2f..037224df07 100644 --- a/bucket/nuget.json +++ b/bucket/nuget.json @@ -1,14 +1,14 @@ { - "homepage": "https://www.nuget.org/", - "description": "The package manager for .NET.", "version": "5.8.0", + "description": "The package manager for .NET.", + "homepage": "https://www.nuget.org/", "license": "Apache-2.0", "url": "https://dist.nuget.org/win-x86-commandline/v5.8.0/NuGet.exe", "hash": "5c5b9c96165d3283b2cb9e5b65825d343e0e7139b9e70a250b4bb24c2285f3ba", "bin": "NuGet.exe", "checkver": { "url": "https://dist.nuget.org/index.json", - "jp": "$..versions[?(@.displayName == 'nuget.exe - recommended latest')].version" + "jsonpath": "$..versions[?(@.displayName == 'nuget.exe - recommended latest')].version" }, "autoupdate": { "url": "https://dist.nuget.org/win-x86-commandline/v$version/NuGet.exe" diff --git a/bucket/nunit-console.json b/bucket/nunit-console.json index a218d2cfc2..494db24f7d 100644 --- a/bucket/nunit-console.json +++ b/bucket/nunit-console.json @@ -1,13 +1,8 @@ { - "homepage": "https://nunit.org/", - "description": "NUnit Console runner for NUnit, the most popular and widely used unit testing framework for .NET", "version": "3.11.1", + "description": "NUnit Console runner for NUnit, the most popular and widely used unit testing framework for .NET", + "homepage": "https://nunit.org/", "license": "MIT", - "url": "https://packages.chocolatey.org/nunit-console-runner.3.11.1.nupkg", - "hash": "e41deca6214fb20de555c8837fe41bff7cdbecb4334b9d76539b6080b3c3ecdc", - "extract_dir": "tools", - "post_install": "New-Item -Path \"$dir\\nunit.scoop.addins\" -ItemType File -Value '../../nunit-extension-*/current/ # find extensions installed under scoop' | Out-Null", - "bin": "nunit3-console.exe", "suggest": { "NuGet": "nuget", "NUnit Extension": [ @@ -18,6 +13,11 @@ "nunit-extension-vs-project-loader" ] }, + "url": "https://packages.chocolatey.org/nunit-console-runner.3.11.1.nupkg", + "hash": "e41deca6214fb20de555c8837fe41bff7cdbecb4334b9d76539b6080b3c3ecdc", + "extract_dir": "tools", + "post_install": "New-Item -Path \"$dir\\nunit.scoop.addins\" -ItemType File -Value '../../nunit-extension-*/current/ # find extensions installed under scoop' | Out-Null", + "bin": "nunit3-console.exe", "checkver": { "url": "https://chocolatey.org/packages/nunit-console-runner", "regex": "\\s+([\\d.]+)" diff --git a/bucket/nunit-extension-nunit-project-loader.json b/bucket/nunit-extension-nunit-project-loader.json index 77e2beec2d..f79884e6ac 100644 --- a/bucket/nunit-extension-nunit-project-loader.json +++ b/bucket/nunit-extension-nunit-project-loader.json @@ -1,12 +1,12 @@ { - "homepage": "https://nunit.org/", - "description": "NUnit Project Loader Extension", "version": "3.6.0", + "description": "NUnit Project Loader Extension", + "homepage": "https://nunit.org/", "license": "MIT", + "depends": "nunit-console", "url": "https://packages.chocolatey.org/nunit-extension-nunit-project-loader.3.6.0.nupkg", "hash": "521c80333844358fcb8cd9896464f87a31dd20dfa4998d1bb6f881e855753dc5", "extract_dir": "tools", - "depends": "nunit-console", "checkver": { "url": "https://chocolatey.org/packages/nunit-extension-nunit-project-loader", "regex": "\\s+([\\d.]+)" diff --git a/bucket/nunit-extension-nunit-v2-driver.json b/bucket/nunit-extension-nunit-v2-driver.json index 6d4efd95d8..8ea14cf16c 100644 --- a/bucket/nunit-extension-nunit-v2-driver.json +++ b/bucket/nunit-extension-nunit-v2-driver.json @@ -1,12 +1,12 @@ { - "homepage": "https://nunit.org/", - "description": "NUnit V2 Framework Driver Extension", "version": "3.8.0", + "description": "NUnit V2 Framework Driver Extension", + "homepage": "https://nunit.org/", "license": "MIT", + "depends": "nunit-console", "url": "https://packages.chocolatey.org/nunit-extension-nunit-v2-driver.3.8.0.nupkg", "hash": "2618b017a60b9236b7ea3eb1c66ee916d8010726fbb3d404445abf9c06a38fdb", "extract_dir": "tools", - "depends": "nunit-console", "checkver": { "url": "https://chocolatey.org/packages/nunit-extension-nunit-v2-driver", "regex": "\\s+([\\d.]+)" diff --git a/bucket/nunit-extension-nunit-v2-result-writer.json b/bucket/nunit-extension-nunit-v2-result-writer.json index 44afdff77d..9b26adaf17 100644 --- a/bucket/nunit-extension-nunit-v2-result-writer.json +++ b/bucket/nunit-extension-nunit-v2-result-writer.json @@ -1,12 +1,12 @@ { - "homepage": "https://nunit.org/", - "description": "NUnit V2 Result Writer Extension", "version": "3.6.0", + "description": "NUnit V2 Result Writer Extension", + "homepage": "https://nunit.org/", "license": "MIT", + "depends": "nunit-console", "url": "https://packages.chocolatey.org/nunit-extension-nunit-v2-result-writer.3.6.0.nupkg", "hash": "9e3526f9b272ab22802c300b8640f34cec29cb9466db785477b414e3f688b16d", "extract_dir": "tools", - "depends": "nunit-console", "checkver": { "url": "https://chocolatey.org/packages/nunit-extension-nunit-v2-result-writer", "regex": "\\s+([\\d.]+)" diff --git a/bucket/nunit-extension-teamcity-event-listener.json b/bucket/nunit-extension-teamcity-event-listener.json index 1388286753..9f165ada37 100644 --- a/bucket/nunit-extension-teamcity-event-listener.json +++ b/bucket/nunit-extension-teamcity-event-listener.json @@ -1,12 +1,12 @@ { - "homepage": "https://nunit.org/", - "description": "NUnit Team City Event Listener Extension", "version": "1.0.7", + "description": "NUnit Team City Event Listener Extension", + "homepage": "https://nunit.org/", "license": "MIT", + "depends": "nunit-console", "url": "https://packages.chocolatey.org/nunit-extension-teamcity-event-listener.1.0.7.nupkg", "hash": "4dc6164ff61068c5486483c1b9f3607b9eae4afe6af747fade75e2aa7c45b55b", "extract_dir": "tools", - "depends": "nunit-console", "checkver": { "url": "https://chocolatey.org/packages/nunit-extension-teamcity-event-listener", "regex": "\\s+([\\d.]+)" diff --git a/bucket/nunit-extension-vs-project-loader.json b/bucket/nunit-extension-vs-project-loader.json index a3e40600aa..e2fc828ae6 100644 --- a/bucket/nunit-extension-vs-project-loader.json +++ b/bucket/nunit-extension-vs-project-loader.json @@ -1,12 +1,12 @@ { - "homepage": "https://nunit.org/", - "description": "NUnit Visual Studio Project Loader Extension", "version": "3.8.0", + "description": "NUnit Visual Studio Project Loader Extension", + "homepage": "https://nunit.org/", "license": "MIT", + "depends": "nunit-console", "url": "https://packages.chocolatey.org/nunit-extension-vs-project-loader.3.8.0.nupkg", "hash": "ed024f0c6695951babb015ce7eee601cfca68f40512ec95ac4fe07dc08e27f0a", "extract_dir": "tools", - "depends": "nunit-console", "checkver": { "url": "https://chocolatey.org/packages/nunit-extension-vs-project-loader", "regex": "\\s+([\\d.]+)" diff --git a/bucket/nvm.json b/bucket/nvm.json index 530b42ae36..8e38800d7b 100644 --- a/bucket/nvm.json +++ b/bucket/nvm.json @@ -1,27 +1,10 @@ { - "license": "MIT", - "homepage": "https://github.com/coreybutler/nvm-windows", - "description": "A node.js version management utility for Windows.", "version": "1.1.7", + "description": "A node.js version management utility for Windows.", + "homepage": "https://github.com/coreybutler/nvm-windows", + "license": "MIT", + "notes": "You'll need to restart powershell/cmd to have it reload Environment Variables so nvm will work correctly", "url": "https://github.com/coreybutler/nvm-windows/releases/download/1.1.7/nvm-noinstall.zip", - "bin": "nvm.exe", - "persist": [ - "nodejs", - [ - "elevate.cmd", - "nodejs\\elevate.cmd" - ], - [ - "elevate.vbs", - "nodejs\\elevate.vbs" - ], - "settings.txt" - ], - "env_add_path": "nodejs\\nodejs", - "env_set": { - "NVM_HOME": "$dir", - "NVM_SYMLINK": "$persist_dir\\nodejs\\nodejs" - }, "hash": "md5:00acf86e40c5f038cca8c383b9d2c207", "architecture": { "64bit": { @@ -39,13 +22,30 @@ ] } }, - "notes": "You'll need to restart powershell/cmd to have it reload Environment Variables so nvm will work correctly", + "bin": "nvm.exe", + "env_add_path": "nodejs\\nodejs", + "env_set": { + "NVM_HOME": "$dir", + "NVM_SYMLINK": "$persist_dir\\nodejs\\nodejs" + }, + "persist": [ + "nodejs", + [ + "elevate.cmd", + "nodejs\\elevate.cmd" + ], + [ + "elevate.vbs", + "nodejs\\elevate.vbs" + ], + "settings.txt" + ], "checkver": "github", "autoupdate": { "url": "https://github.com/coreybutler/nvm-windows/releases/download/$version/nvm-noinstall.zip", "hash": { "url": "$url.checksum.txt", - "find": "([a-fA-F0-9]{32})" + "regex": "$md5" } } } diff --git a/bucket/octave.json b/bucket/octave.json index fcc0d7210b..778ae69727 100644 --- a/bucket/octave.json +++ b/bucket/octave.json @@ -1,7 +1,7 @@ { - "homepage": "https://www.gnu.org/software/octave/", - "description": "A high-level language primarily intended for numerical computations.", "version": "6.1.0", + "description": "A high-level language primarily intended for numerical computations.", + "homepage": "https://www.gnu.org/software/octave/", "license": "GPL-3.0-only", "architecture": { "64bit": { @@ -29,7 +29,7 @@ }, "checkver": { "url": "https://wiki.octave.org/GNU_Octave_Wiki", - "re": "GNU Octave ([\\d.]+).*is the current stable release" + "regex": "GNU Octave ([\\d.]+).*is the current stable release" }, "autoupdate": { "architecture": { diff --git a/bucket/openresty.json b/bucket/openresty.json index d477c9a103..fdf8dce760 100644 --- a/bucket/openresty.json +++ b/bucket/openresty.json @@ -1,8 +1,16 @@ { - "homepage": "https://openresty.org", "version": "1.19.3.1", - "license": "BSD-2-Clause", "description": "Dynamic web platform based on NGINX and LuaJIT.", + "homepage": "https://openresty.org", + "license": "BSD-2-Clause", + "notes": [ + "Use '-p $PWD' to specify current directory when running OpenResty.", + "(Alternately, see documentation by running 'scoop home openresty'.)", + "'resty' and 'restydoc' command-line utilities require 'perl'" + ], + "suggest": { + "Perl": "perl" + }, "architecture": { "64bit": { "url": "https://openresty.org/download/openresty-1.19.3.1-win64.zip", @@ -29,14 +37,6 @@ "html", "logs" ], - "notes": [ - "Use '-p $PWD' to specify current directory when running OpenResty.", - "(Alternately, see documentation by running 'scoop home openresty'.)", - "'resty' and 'restydoc' command-line utilities require 'perl'" - ], - "suggest": { - "Perl": "perl" - }, "checkver": "OpenResty ([\\d.]+)", "autoupdate": { "architecture": { diff --git a/bucket/openshift-origin-client.json b/bucket/openshift-origin-client.json index 0bc21006ca..5c21dddb35 100644 --- a/bucket/openshift-origin-client.json +++ b/bucket/openshift-origin-client.json @@ -1,8 +1,8 @@ { - "homepage": "https://www.openshift.org", - "description": "OpenShift Origin is a distribution of Kubernetes optimized for continuous application development and multi-tenant deployment. OpenShift adds developer and operations-centric tools on top of Kubernetes to enable rapid application development, easy deployment and scaling, and long-term lifecycle maintenance for small and large teams.", - "license": "Apache-2.0", "version": "3.11.0", + "description": "OpenShift Origin is a distribution of Kubernetes optimized for continuous application development and multi-tenant deployment. OpenShift adds developer and operations-centric tools on top of Kubernetes to enable rapid application development, easy deployment and scaling, and long-term lifecycle maintenance for small and large teams.", + "homepage": "https://www.openshift.org", + "license": "Apache-2.0", "architecture": { "64bit": { "url": "https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-windows.zip", @@ -12,7 +12,7 @@ "bin": "oc.exe", "checkver": { "url": "https://github.com/openshift/origin/releases/latest", - "re": "openshift-origin-client-tools-v(?[\\d.]+)-(?[\\d\\w]+)-windows\\.zip" + "regex": "openshift-origin-client-tools-v(?[\\d.]+)-(?[\\w]+)-windows\\.zip" }, "autoupdate": { "architecture": { diff --git a/bucket/openssh.json b/bucket/openssh.json index 50663e7f94..d34084f4ef 100644 --- a/bucket/openssh.json +++ b/bucket/openssh.json @@ -1,7 +1,7 @@ { - "homepage": "https://www.openssh.com/", - "description": "A suite of secure networking utilities based on the Secure Shell protocol.", "version": "8.2p1-1", + "description": "A suite of secure networking utilities based on the Secure Shell protocol.", + "homepage": "https://www.openssh.com/", "license": "ISC", "architecture": { "64bit": { @@ -39,31 +39,31 @@ ] } }, + "pre_install": [ + "ensure \"$dir\\tmp\" | Out-Null", + "ensure \"$dir\\home\" | Out-Null", + "ensure \"$dir\\home\\$env:UserName\" | Out-Null", + "ensure \"$env:UserProfile\\.ssh\" | Out-Null", + "cmd /c mklink /j \"$dir\\home\\%UserName%\\.ssh\" \"%UserProfile%\\.ssh\"" + ], "bin": [ [ - "usr/bin/sh.exe", + "usr\\bin\\sh.exe", "findssl.sh", "$dir/usr/bin/findssl.sh" ], - "usr/bin/scp.exe", - "usr/bin/sftp.exe", - "usr/bin/ssh.exe", - "usr/bin/ssh-add.exe", - "usr/bin/ssh-agent.exe", + "usr\\bin\\scp.exe", + "usr\\bin\\sftp.exe", + "usr\\bin\\ssh.exe", + "usr\\bin\\ssh-add.exe", + "usr\\bin\\ssh-agent.exe", [ - "usr/bin/sh.exe", + "usr\\bin\\sh.exe", "ssh-copy-id", "$dir/usr/bin/ssh-copy-id" ], - "usr/bin/ssh-keygen.exe", - "usr/bin/ssh-keyscan.exe", - "usr/bin/sshd.exe" - ], - "pre_install": [ - "mkdir \"$dir/tmp\"", - "mkdir \"$dir/home\"", - "mkdir \"$dir/home/$env:UserName\"", - "mkdir -Force \"$env:UserProfile/.ssh\"", - "cmd /c mklink /j \"$dir\\home\\%UserName%\\.ssh\" \"%UserProfile%\\.ssh\"" + "usr\\bin\\ssh-keygen.exe", + "usr\\bin\\ssh-keyscan.exe", + "usr\\bin\\sshd.exe" ] } diff --git a/bucket/openssl.json b/bucket/openssl.json index 22a9f5a20e..357e44fba9 100644 --- a/bucket/openssl.json +++ b/bucket/openssl.json @@ -1,11 +1,11 @@ { - "homepage": "https://slproweb.com/products/Win32OpenSSL.html", "version": "1.1.1i", + "description": "TLS/SSL toolkit", + "homepage": "https://slproweb.com/products/Win32OpenSSL.html", "license": { "identifier": "OpenSSL|Freeware", "url": "https://www.openssl.org/source/license-openssl-ssleay.txt" }, - "description": "TLS/SSL toolkit", "architecture": { "64bit": { "url": "https://slproweb.com/download/Win64OpenSSL-1_1_1i.exe", @@ -18,10 +18,10 @@ }, "innosetup": true, "bin": "bin\\openssl.exe", + "env_add_path": "bin", "env_set": { "OPENSSL_CONF": "$dir\\bin\\cnf\\openssl.cnf" }, - "env_add_path": "bin", "checkver": "Win32 OpenSSL v([^\\s]+)", "autoupdate": { "architecture": { @@ -33,9 +33,8 @@ } }, "hash": { - "mode": "json", - "jp": "$.files.['$basename'].sha256", - "url": "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json" + "url": "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json", + "jsonpath": "$.files.['$basename'].sha256" } } } diff --git a/bucket/optipng.json b/bucket/optipng.json index 2f9645a58f..ba08b6026b 100644 --- a/bucket/optipng.json +++ b/bucket/optipng.json @@ -1,7 +1,7 @@ { - "homepage": "http://optipng.sourceforge.net/", - "description": "A PNG optimizer that recompresses image files to a smaller size, without losing any information.", "version": "0.7.7", + "description": "A PNG optimizer that recompresses image files to a smaller size, without losing any information.", + "homepage": "http://optipng.sourceforge.net/", "license": "Zlib", "url": "https://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.7/optipng-0.7.7-win32.zip", "hash": "sha1:2a1484d27bf63c7a15c3494eea95a2c804f5bdbc", diff --git a/bucket/opus-tools.json b/bucket/opus-tools.json index cd56f4220f..5c07f15cc3 100644 --- a/bucket/opus-tools.json +++ b/bucket/opus-tools.json @@ -1,7 +1,7 @@ { - "homepage": "http://www.opus-codec.org/", "version": "0.2-opus-1.3", "description": "Command-line utilities to encode, inspect, and decode .opus files.", + "homepage": "http://www.opus-codec.org/", "license": "BSD-2-Clause|GPL-2.0-only", "architecture": { "64bit": { diff --git a/bucket/osslsigncode.json b/bucket/osslsigncode.json index 8e366b6ff8..1f6ab9b5ae 100644 --- a/bucket/osslsigncode.json +++ b/bucket/osslsigncode.json @@ -1,8 +1,8 @@ { - "homepage": "https://sourceforge.net/projects/osslsigncode/", - "description": "Platform-independent tool for Authenticode signing of PE(EXE/SYS/DLL/etc), CAB and MSI files - uses OpenSSL and libcurl. It also supports timestamping (Authenticode and RFC3161).", - "license": "GPL-3.0-or-later", "version": "1.7.1-1", + "description": "Platform-independent tool for Authenticode signing of PE(EXE/SYS/DLL/etc), CAB and MSI files - uses OpenSSL and libcurl. It also supports timestamping (Authenticode and RFC3161).", + "homepage": "https://sourceforge.net/projects/osslsigncode/", + "license": "GPL-3.0-or-later", "architecture": { "64bit": { "url": "https://downloads.sourceforge.net/project/unix-utils/osslsigncode/osslsigncode-1.7.1-1-x86_64.zip", @@ -18,7 +18,7 @@ "bin": "osslsigncode.exe", "checkver": { "url": "https://sourceforge.net/projects/unix-utils/files/osslsigncode/", - "re": "osslsigncode-([\\d.-]+)-x86_64" + "regex": "osslsigncode-([\\d.-]+)-x86_64" }, "autoupdate": { "architecture": {