From c796dbc3953d725e64a1eddc7ec767bdaf5a4257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8C=C3=A1bera?= Date: Fri, 22 Jan 2021 07:52:17 +0100 Subject: [PATCH] argocd: Update to version 1.8.3 format --- bucket/argocd.json | 6 +++--- bucket/avro-tools.json | 6 +++--- bucket/cake.json | 6 +++--- bucket/halo.json | 6 +++--- bucket/kafka.json | 12 ++++++------ bucket/lsd.json | 6 +++--- bucket/minio-client.json | 18 +++++++++--------- bucket/neofetch.json | 12 ++++++------ bucket/neovim.json | 6 +++--- bucket/php-nts.json | 36 ++++++++++++++++++------------------ bucket/php.json | 36 ++++++++++++++++++------------------ bucket/redpen.json | 12 ++++++------ bucket/ruby.json | 10 +++++----- bucket/saml2aws.json | 6 +++--- bucket/scons.json | 6 +++--- bucket/sonar-scanner.json | 8 ++++---- bucket/tesseract.json | 6 +++--- bucket/vimtutor.json | 6 +++--- 18 files changed, 102 insertions(+), 102 deletions(-) diff --git a/bucket/argocd.json b/bucket/argocd.json index 8e1e86a023..1e04cc8efe 100644 --- a/bucket/argocd.json +++ b/bucket/argocd.json @@ -1,12 +1,12 @@ { - "version": "1.8.2", + "version": "1.8.3", "description": "CLI for ArgoCD - declarative, GitOps continuous delivery tool for Kubernetes", "homepage": "https://github.com/argoproj/argo-cd", "license": "Apache-2.0", "architecture": { "64bit": { - "url": "https://github.com/argoproj/argo-cd/releases/download/v1.8.2/argocd-windows-amd64.exe#/argocd.exe", - "hash": "4dab927329164d96e2fd8fd0dd5bfc9a8375ba5be1e7afd918a76c5497e63de9" + "url": "https://github.com/argoproj/argo-cd/releases/download/v1.8.3/argocd-windows-amd64.exe#/argocd.exe", + "hash": "3be6a4bfab4ba28b340de68e2d86f8bcd9da4534ed05021e6e7987439d8eabe9" } }, "bin": "argocd.exe", diff --git a/bucket/avro-tools.json b/bucket/avro-tools.json index d24f4bc448..a1b8812f48 100644 --- a/bucket/avro-tools.json +++ b/bucket/avro-tools.json @@ -3,15 +3,15 @@ "description": "A collection of Avro tools. Data serialization system.", "homepage": "https://avro.apache.org/", "license": "Apache-2.0", - "url": "https://apache.org/dist/avro/avro-1.10.1/java/avro-tools-1.10.1.jar#/avro-tools.jar", - "hash": "sha512:d7f237fbae7719aa7da14d2aef81b9823ab03ac97e6b2a676a91263bbfa75aed94389591ea001f17fbc875c7ae9ad4271bfe00eb2ffb94d78adfe5e6e99d3a6c", - "bin": "avro-tools.jar", "suggest": { "JDK": [ "java/oraclejdk", "java/openjdk" ] }, + "url": "https://apache.org/dist/avro/avro-1.10.1/java/avro-tools-1.10.1.jar#/avro-tools.jar", + "hash": "sha512:d7f237fbae7719aa7da14d2aef81b9823ab03ac97e6b2a676a91263bbfa75aed94389591ea001f17fbc875c7ae9ad4271bfe00eb2ffb94d78adfe5e6e99d3a6c", + "bin": "avro-tools.jar", "checkver": { "url": "https://avro.apache.org/releases.html", "regex": "Avro ([\\d.]+) Released" diff --git a/bucket/cake.json b/bucket/cake.json index 4de8e31bcb..037093a1c3 100644 --- a/bucket/cake.json +++ b/bucket/cake.json @@ -3,12 +3,12 @@ "description": "Cake (C# Make) is a cross-platform build automation system with a C# DSL", "homepage": "https://cakebuild.net/", "license": "MIT", - "url": "https://github.com/cake-build/cake/releases/download/v0.38.5/Cake-bin-net461-v0.38.5.zip", - "hash": "7bda8369d90477288bda335484ab0905f1af8e780cd4b643f65e624491e2b456", - "bin": "cake.exe", "suggest": { "NuGet": "nuget" }, + "url": "https://github.com/cake-build/cake/releases/download/v0.38.5/Cake-bin-net461-v0.38.5.zip", + "hash": "7bda8369d90477288bda335484ab0905f1af8e780cd4b643f65e624491e2b456", + "bin": "cake.exe", "checkver": { "github": "https://github.com/cake-build/cake" }, diff --git a/bucket/halo.json b/bucket/halo.json index bec06bd9c2..6223b29c1c 100644 --- a/bucket/halo.json +++ b/bucket/halo.json @@ -3,15 +3,15 @@ "description": "A modern personal independent blog system.", "homepage": "https://halo.run", "license": "GPL-3.0-or-later", - "url": "https://github.com/halo-dev/halo/releases/download/v1.4.2/halo-1.4.2.jar#/halo.jar", - "hash": "da6081d4267f05de428f432f01adb577b50bc772689e24f92fac1180fffe0097", - "bin": "halo.jar", "suggest": { "JDK": [ "java/oraclejdk", "java/openjdk" ] }, + "url": "https://github.com/halo-dev/halo/releases/download/v1.4.2/halo-1.4.2.jar#/halo.jar", + "hash": "da6081d4267f05de428f432f01adb577b50bc772689e24f92fac1180fffe0097", + "bin": "halo.jar", "checkver": { "github": "https://github.com/halo-dev/halo" }, diff --git a/bucket/kafka.json b/bucket/kafka.json index 1e6080f865..7a99a51ecc 100644 --- a/bucket/kafka.json +++ b/bucket/kafka.json @@ -3,6 +3,12 @@ "description": "Apache Kafka. A distributed streaming platform.", "homepage": "https://kafka.apache.org/", "license": "Apache-2.0", + "suggest": { + "JDK": [ + "java/oraclejdk", + "java/openjdk" + ] + }, "url": "https://www.apache.org/dist/kafka/2.7.0/kafka_2.12-2.7.0.tgz", "hash": "sha1:dfd6bc3b86d5cc9e57aa3e7bb8803f66dd5f026b", "extract_dir": "kafka_2.12-2.7.0", @@ -35,12 +41,6 @@ "config", "logs" ], - "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] - }, "checkver": { "url": "https://kafka.apache.org/downloads", "regex": "current stable version is ([\\d.]+)\\." diff --git a/bucket/lsd.json b/bucket/lsd.json index f0dd37ad15..a472435760 100644 --- a/bucket/lsd.json +++ b/bucket/lsd.json @@ -3,6 +3,9 @@ "description": "The next gen ls command", "homepage": "https://github.com/Peltoche/lsd", "license": "Apache-2.0", + "suggest": { + "vcredist": "extras/vcredist2015" + }, "architecture": { "64bit": { "url": "https://github.com/Peltoche/lsd/releases/download/0.19.0/lsd-0.19.0-x86_64-pc-windows-msvc.zip", @@ -28,8 +31,5 @@ "extract_dir": "lsd-$version-i686-pc-windows-msvc" } } - }, - "suggest": { - "vcredist": "extras/vcredist2015" } } diff --git a/bucket/minio-client.json b/bucket/minio-client.json index 4cee4eaf82..d99811de68 100644 --- a/bucket/minio-client.json +++ b/bucket/minio-client.json @@ -3,28 +3,28 @@ "description": "A high performance, distributed object storage server, designed for large-scale data infrastructure. (client)", "homepage": "https://min.io/", "license": "Apache-2.0", - "bin": "mc.exe", + "suggest": { + "minio": "minio" + }, "architecture": { "64bit": { "url": "https://dl.min.io/client/mc/release/windows-amd64/archive/mc.RELEASE.2021-01-16T02-45-34Z#/mc.exe", "hash": "ef7df1f1631022891c3018f49c0f41998b35be680609797022a913b7e82d41e1" } }, - "suggest": { - "minio": "minio" - }, + "bin": "mc.exe", "checkver": { "github": "https://github.com/minio/mc", - "regex": "releases/tag/RELEASE.([\\d-]+T[\\d-]+Z)" + "regex": "releases/tag/RELEASE\\.([\\d-]+T[\\d-]+Z)" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://dl.min.io/client/mc/release/windows-amd64/archive/mc.RELEASE.$version#/mc.exe", - "hash": { - "url": "$url.sha256sum" - } + "url": "https://dl.min.io/client/mc/release/windows-amd64/archive/mc.RELEASE.$version#/mc.exe" } + }, + "hash": { + "url": "$url.sha256sum" } } } diff --git a/bucket/neofetch.json b/bucket/neofetch.json index aa48338f13..fa54d9cfaf 100644 --- a/bucket/neofetch.json +++ b/bucket/neofetch.json @@ -3,6 +3,12 @@ "description": "A command-line system information tool written in bash 3.2+.", "homepage": "https://github.com/dylanaraps/neofetch", "license": "MIT", + "suggest": { + "git": [ + "git", + "git-with-openssh" + ] + }, "url": "https://raw.githubusercontent.com/dylanaraps/neofetch/7.1.0/neofetch", "hash": "3dc33493e54029fb1528251552093a9f9a2894fcf94f9c3a6f809136a42348c7", "pre_install": [ @@ -10,12 +16,6 @@ "Write-Output \"& `$(join-path `$(scoop prefix $git) 'bin\\bash.exe') `$(join-path `$psscriptroot 'neofetch') @args\" | Out-File \"$dir\\neofetch.ps1\" -encoding utf8" ], "bin": "neofetch.ps1", - "suggest": { - "git": [ - "git", - "git-with-openssh" - ] - }, "checkver": "github", "autoupdate": { "url": "https://raw.githubusercontent.com/dylanaraps/neofetch/$version/neofetch" diff --git a/bucket/neovim.json b/bucket/neovim.json index 5ee1a863c9..0e743f6183 100644 --- a/bucket/neovim.json +++ b/bucket/neovim.json @@ -6,6 +6,9 @@ "identifier": "Apache-2.0,Vim", "url": "https://github.com/neovim/neovim/blob/master/LICENSE" }, + "suggest": { + "vcredist": "extras/vcredist2015" + }, "architecture": { "64bit": { "url": "https://github.com/neovim/neovim/releases/download/v0.4.4/nvim-win64.zip", @@ -39,8 +42,5 @@ "url": "https://github.com/neovim/neovim/releases/download/v$version/nvim-win32.zip" } } - }, - "suggest": { - "vcredist": "extras/vcredist2015" } } diff --git a/bucket/php-nts.json b/bucket/php-nts.json index 27996414ee..526576b855 100644 --- a/bucket/php-nts.json +++ b/bucket/php-nts.json @@ -3,6 +3,9 @@ "description": "A popular general-purpose scripting language that is especially suited to web development. (non-thread safe)", "homepage": "https://windows.php.net/", "license": "PHP-3.01", + "suggest": { + "vcredist": "extras/vcredist2019" + }, "architecture": { "64bit": { "url": "https://windows.php.net/downloads/releases/php-8.0.1-nts-Win32-vs16-x64.zip", @@ -13,21 +16,6 @@ "hash": "410089d7317d579fb86bbd4cfb4f275ee117ab4742c87332731811f6fde34480" } }, - "bin": [ - "php.exe", - "php-cgi.exe", - "phpdbg.exe" - ], - "persist": [ - "cli", - [ - "php.ini-production", - "cli\\php.ini" - ] - ], - "env_set": { - "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;" - }, "pre_install": [ "# Create directory for custom PHP configuration", "if (!(Test-Path \"$dir\\cli\\conf.d\")) {", @@ -38,6 +26,21 @@ "# Enable extensions to be found in installation-relative folder (the default is to search C:/php)", "(Get-Content \"$dir\\cli\\php.ini\") | % { $_ -replace ';\\s?(extension_dir = \"ext\")', '$1' } | Set-Content \"$dir\\cli\\php.ini\"" ], + "bin": [ + "php.exe", + "php-cgi.exe", + "phpdbg.exe" + ], + "env_set": { + "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;" + }, + "persist": [ + "cli", + [ + "php.ini-production", + "cli\\php.ini" + ] + ], "checkver": { "url": "https://windows.php.net/download/", "regex": "

.*?\\(([\\d.]+)\\)

" @@ -54,8 +57,5 @@ "hash": { "url": "$baseurl/sha256sum.txt" } - }, - "suggest": { - "vcredist": "extras/vcredist2019" } } diff --git a/bucket/php.json b/bucket/php.json index 07e25f8c0a..a6338cd7b5 100644 --- a/bucket/php.json +++ b/bucket/php.json @@ -3,6 +3,9 @@ "description": "A popular general-purpose scripting language that is especially suited to web development. (thread safe)", "homepage": "https://windows.php.net/", "license": "PHP-3.01", + "suggest": { + "vcredist": "extras/vcredist2019" + }, "architecture": { "64bit": { "url": "https://windows.php.net/downloads/releases/php-8.0.1-Win32-vs16-x64.zip", @@ -13,21 +16,6 @@ "hash": "b485642814681ce6dcaea22acc0aaae4334f0c1923f296f26323940a269833e2" } }, - "bin": [ - "php.exe", - "php-cgi.exe", - "phpdbg.exe" - ], - "persist": [ - "cli", - [ - "php.ini-production", - "cli\\php.ini" - ] - ], - "env_set": { - "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;" - }, "pre_install": [ "# Create directory for custom PHP configuration", "if (!(Test-Path \"$dir\\cli\\conf.d\")) {", @@ -38,6 +26,21 @@ "# Enable extensions to be found in installation-relative folder (the default is to search C:/php)", "(Get-Content \"$dir\\cli\\php.ini\") | % { $_ -replace ';\\s?(extension_dir = \"ext\")', '$1' } | Set-Content \"$dir\\cli\\php.ini\"" ], + "bin": [ + "php.exe", + "php-cgi.exe", + "phpdbg.exe" + ], + "env_set": { + "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;" + }, + "persist": [ + "cli", + [ + "php.ini-production", + "cli\\php.ini" + ] + ], "checkver": { "url": "https://windows.php.net/download/", "regex": "

.*?\\(([\\d.]+)\\)

" @@ -54,8 +57,5 @@ "hash": { "url": "$baseurl/sha256sum.txt" } - }, - "suggest": { - "vcredist": "extras/vcredist2019" } } diff --git a/bucket/redpen.json b/bucket/redpen.json index bd687a0980..dfe3347f86 100644 --- a/bucket/redpen.json +++ b/bucket/redpen.json @@ -3,6 +3,12 @@ "description": "A proofreading tool.", "homepage": "http://redpen.cc", "license": "Apache-2.0", + "suggest": { + "Java": [ + "oraclejdk", + "adopt8-hotspot-jre" + ] + }, "url": "https://github.com/redpen-cc/redpen/releases/download/redpen-1.10.4/redpen-distribution-1.10.4-assembled.tar.gz", "hash": "6c3dc4a6a45828f9cc833ca7253fdb036179036631248288251cb9ac4520c39d", "extract_dir": "redpen-distribution-1.10.4", @@ -10,12 +16,6 @@ "bin\\redpen.bat", "bin\\redpen-server.bat" ], - "suggest": { - "Java": [ - "oraclejdk", - "adopt8-hotspot-jre" - ] - }, "checkver": { "github": "https://github.com/redpen-cc/redpen/", "regex": "Release ([\\d.]+)" diff --git a/bucket/ruby.json b/bucket/ruby.json index 413f3fdb9d..59395ea421 100644 --- a/bucket/ruby.json +++ b/bucket/ruby.json @@ -4,6 +4,9 @@ "homepage": "https://rubyinstaller.org", "license": "BSD-3-Clause", "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!", + "suggest": { + "MSYS2": "msys2" + }, "architecture": { "64bit": { "url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.0-1/rubyinstaller-3.0.0-1-x64.7z", @@ -16,7 +19,7 @@ "extract_dir": "rubyinstaller-3.0.0-1-x86" } }, - "persist": "gems", + "post_install": "gem install rake", "env_add_path": [ "bin", "gems\\bin" @@ -25,10 +28,7 @@ "GEM_HOME": "$dir\\gems", "GEM_PATH": "$dir\\gems" }, - "suggest": { - "MSYS2": "msys2" - }, - "post_install": "gem install rake", + "persist": "gems", "checkver": { "url": "https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml", "regex": "Ruby (\\S+)" diff --git a/bucket/saml2aws.json b/bucket/saml2aws.json index abaa10ff29..20b7208370 100644 --- a/bucket/saml2aws.json +++ b/bucket/saml2aws.json @@ -3,6 +3,9 @@ "description": "Login and retrieve Amazon Web Services / AWS temporary credentials using a SAML IDP.", "homepage": "https://github.com/Versent/saml2aws", "license": "MIT", + "suggest": { + "AWS": "aws" + }, "architecture": { "64bit": { "url": "https://github.com/Versent/saml2aws/releases/download/v2.27.1/saml2aws_2.27.1_windows_amd64.tar.gz", @@ -20,8 +23,5 @@ } } } - }, - "suggest": { - "AWS": "aws" } } diff --git a/bucket/scons.json b/bucket/scons.json index 5bc9e2056a..66c42f15af 100644 --- a/bucket/scons.json +++ b/bucket/scons.json @@ -3,13 +3,13 @@ "description": "A software construction tool", "homepage": "https://scons.org/", "license": "MIT", + "suggest": { + "Python": "python" + }, "url": "https://downloads.sourceforge.net/project/scons/scons-local/4.1.0/scons-local-4.1.0.zip", "hash": "sha1:2c1288c5661e5e1f3cc835f407f7cb183863e1cf", "pre_install": "echo \"python `\"$dir\\scons.py`\" @args\" | out-file \"$dir\\scons.ps1\"", "bin": "scons.ps1", - "suggest": { - "Python": "python" - }, "checkver": { "url": "https://scons.org/pages/download.html", "regex": "The current production release of SCons is ([\\d.]+)" diff --git a/bucket/sonar-scanner.json b/bucket/sonar-scanner.json index 35c517d699..8bc9764f95 100644 --- a/bucket/sonar-scanner.json +++ b/bucket/sonar-scanner.json @@ -3,10 +3,6 @@ "description": "Source code scanner for SonarQube analyzer.", "homepage": "https://docs.sonarqube.org/latest/analysis/scan/sonarscanner/", "license": "LGPL-3.0-only", - "url": "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.0.2311.zip", - "hash": "e45599982e455fc36ac896579a9b88957060882b8eaa3a2d69e9e373f9174381", - "extract_dir": "sonar-scanner-4.6.0.2311", - "bin": "bin\\sonar-scanner.bat", "suggest": { "JDK": [ "java/oraclejdk", @@ -14,6 +10,10 @@ ], "SonarQube": "sonarqube" }, + "url": "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.0.2311.zip", + "hash": "e45599982e455fc36ac896579a9b88957060882b8eaa3a2d69e9e373f9174381", + "extract_dir": "sonar-scanner-4.6.0.2311", + "bin": "bin\\sonar-scanner.bat", "checkver": { "github": "https://github.com/SonarSource/sonar-scanner-cli" }, diff --git a/bucket/tesseract.json b/bucket/tesseract.json index 9743e6b23d..779cadd61a 100644 --- a/bucket/tesseract.json +++ b/bucket/tesseract.json @@ -7,6 +7,9 @@ "Recognition data files can be installed via \"scoop install tesseract-languages\"", "or downloaded manually from https://github.com/tesseract-ocr/tessdata_fast" ], + "suggest": { + "tesseract-languages": "tesseract-languages" + }, "architecture": { "64bit": { "url": "https://digi.bib.uni-mannheim.de/tesseract/tesseract-ocr-w64-setup-v5.0.0-alpha.20201127.exe#/dl.7z", @@ -46,9 +49,6 @@ " env \"TESSDATA_PREFIX\" $global $langdir", "}" ], - "suggest": { - "tesseract-languages": "tesseract-languages" - }, "checkver": { "url": "https://digi.bib.uni-mannheim.de/tesseract/?C=M;O=D", "regex": "tesseract-ocr-w32-setup-v([\\w.-]+)\\.exe" diff --git a/bucket/vimtutor.json b/bucket/vimtutor.json index 3a812d3eec..8c2a4defc2 100644 --- a/bucket/vimtutor.json +++ b/bucket/vimtutor.json @@ -3,12 +3,12 @@ "description": "The vimtutor that comes with Vim for Windows doesn't work with Scoop. This one does.", "homepage": "https://github.com/lukesampson/psutils", "license": "MIT", - "url": "https://raw.githubusercontent.com/lukesampson/psutils/3290c04d7653ea8183a5e11d3d5a4e46716035d1/vimtutor.ps1", - "hash": "1df57e3bf4139ca096acd71896cc1797ae539ed3ab77185c0ed93846b3c60790", - "bin": "vimtutor.ps1", "suggest": { "vim": "vim" }, + "url": "https://raw.githubusercontent.com/lukesampson/psutils/3290c04d7653ea8183a5e11d3d5a4e46716035d1/vimtutor.ps1", + "hash": "1df57e3bf4139ca096acd71896cc1797ae539ed3ab77185c0ed93846b3c60790", + "bin": "vimtutor.ps1", "checkver": { "url": "https://github.com/lukesampson/psutils/commits/master/vimtutor.ps1.atom", "regex": "(?s)>(\\d+)-(\\d+)-(\\d+)T.*?/(?[0-9a-f]{40})",