diff --git a/ant.json b/ant.json index fe65a6baa1..57861b7b00 100644 --- a/ant.json +++ b/ant.json @@ -10,7 +10,10 @@ "ANT_HOME": "$dir" }, "suggest": { - "JDK": [ "extras/oraclejdk", "openjdk" ] + "JDK": [ + "extras/oraclejdk", + "openjdk" + ] }, "checkver": { "url": "https://ant.apache.org/bindownload.cgi", @@ -20,8 +23,6 @@ "url": "http://www-us.apache.org/dist/ant/binaries/apache-ant-$version-bin.zip", "extract_dir": "apache-ant-$version", "hash": { - "mode": "extract", - "type": "sha512", "url": "http://www-us.apache.org/dist/ant/binaries/apache-ant-$version-bin.zip.sha512" } } diff --git a/apache.json b/apache.json index 9336c33244..72dbd216fe 100644 --- a/apache.json +++ b/apache.json @@ -45,9 +45,8 @@ $root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\ } }, "hash": { - "mode": "extract", "url": "$url.txt", - "find": "SHA256-Checksum for: (?:$basename):\\s+([a-zA-Z0-9]{64})" + "find": "SHA256-Checksum for: (?:$basename):\\s+([a-fA-F0-9]{64})" } } } diff --git a/dart.json b/dart.json index 12fb9c8393..b8da237881 100644 --- a/dart.json +++ b/dart.json @@ -30,8 +30,6 @@ } }, "hash": { - "mode": "extract", - "type": "sha256", "url": "$url.sha256sum" } } diff --git a/docker-machine.json b/docker-machine.json index 2950271537..c6ed806881 100644 --- a/docker-machine.json +++ b/docker-machine.json @@ -30,9 +30,7 @@ } }, "hash": { - "mode": "extract", - "url": "https://github.com/docker/machine/releases/download/v$version/sha256sum.txt", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://github.com/docker/machine/releases/download/v$version/sha256sum.txt" } } } diff --git a/ghostscript.json b/ghostscript.json index 0e139a1887..6881bb7e45 100644 --- a/ghostscript.json +++ b/ghostscript.json @@ -38,9 +38,7 @@ } }, "hash": { - "mode": "extract", - "url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$cleanVersion/SHA256SUMS", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$cleanVersion/SHA256SUMS" } } } diff --git a/go.json b/go.json index 2ff964866d..b2ff0fc37e 100644 --- a/go.json +++ b/go.json @@ -28,9 +28,7 @@ } }, "hash": { - "mode": "extract", - "url": "$url.sha256", - "find": "([a-z0-9]{64})" + "url": "$url.sha256" } } } diff --git a/julia.json b/julia.json index 2e154c6aae..5047ca5809 100644 --- a/julia.json +++ b/julia.json @@ -49,9 +49,7 @@ } }, "hash": { - "mode": "extract", - "url": "https://s3.amazonaws.com/julialang/bin/checksums/julia-$version.sha256", - "find": "([a-z0-9]{64})\\s+\\*(?:$basename)" + "url": "https://s3.amazonaws.com/julialang/bin/checksums/julia-$version.sha256" } } } diff --git a/kubectl.json b/kubectl.json index 1076517f2d..92176b6c36 100644 --- a/kubectl.json +++ b/kubectl.json @@ -31,9 +31,6 @@ } }, "hash": { - "type": "sha1", - "mode": "extract", - "find": "^([a-f0-9]{40})$", "url": "$url.sha1" } } diff --git a/minikube.json b/minikube.json index 2b00f9e8df..3321d7a8f6 100644 --- a/minikube.json +++ b/minikube.json @@ -24,7 +24,6 @@ } }, "hash": { - "mode": "extract", "url": "$url.sha256" } } diff --git a/mysql-workbench.json b/mysql-workbench.json index c163279872..d991fc14d4 100644 --- a/mysql-workbench.json +++ b/mysql-workbench.json @@ -18,10 +18,7 @@ } }, "hash": { - "mode": "extract", - "url": "$url.md5", - "type": "md5", - "find": "([a-z0-9]{32})\\s+(?:$basename)" + "url": "$url.md5" } }, "bin": [ diff --git a/nodejs-lts.json b/nodejs-lts.json index 971e96639d..52cb3cc666 100644 --- a/nodejs-lts.json +++ b/nodejs-lts.json @@ -37,9 +37,7 @@ Set-Content -Value \"prefix=$dir\\bin\" -Path $dir\\node_modules\\npm\\npmrc", } }, "hash": { - "mode": "extract", - "url": "https://nodejs.org/dist/v$version/SHASUMS256.txt.asc", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://nodejs.org/dist/v$version/SHASUMS256.txt.asc" } } } diff --git a/nodejs.json b/nodejs.json index fd270788f8..47742e5e23 100644 --- a/nodejs.json +++ b/nodejs.json @@ -37,9 +37,7 @@ Set-Content -Value \"prefix=$dir\\bin\" -Path $dir\\node_modules\\npm\\npmrc", } }, "hash": { - "mode": "extract", - "url": "https://nodejs.org/dist/v$version/SHASUMS256.txt.asc", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://nodejs.org/dist/v$version/SHASUMS256.txt.asc" } } } diff --git a/openjdk.json b/openjdk.json index 92e041e782..b349dec23f 100644 --- a/openjdk.json +++ b/openjdk.json @@ -25,9 +25,7 @@ } }, "hash": { - "mode": "extract", - "url": "$url.sha256", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "$url.sha256" } } } diff --git a/packer.json b/packer.json index 3e0b9ebcba..4038855bd1 100644 --- a/packer.json +++ b/packer.json @@ -29,9 +29,7 @@ } }, "hash": { - "mode": "extract", - "url": "https://releases.hashicorp.com/packer/$version/packer_$version_SHA256SUMS", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://releases.hashicorp.com/packer/$version/packer_$version_SHA256SUMS" } } } diff --git a/php-nts.json b/php-nts.json index bdbbaa4600..62eee552d4 100644 --- a/php-nts.json +++ b/php-nts.json @@ -55,10 +55,7 @@ if (!(Test-Path \"$dir\\cli\\conf.d\")) { } }, "hash": { - "mode": "extract", - "type": "sha1", - "url": "http://windows.php.net/downloads/releases/sha1sum.txt", - "find": "([a-z0-9]{40})\\s+(?:$basename)" + "url": "http://windows.php.net/downloads/releases/sha1sum.txt" } }, "suggest": { diff --git a/php.json b/php.json index 0ed0bb2b65..30b41009c9 100644 --- a/php.json +++ b/php.json @@ -55,10 +55,7 @@ if (!(Test-Path \"$dir\\cli\\conf.d\")) { } }, "hash": { - "mode": "extract", - "type": "sha1", - "url": "http://windows.php.net/downloads/releases/sha1sum.txt", - "find": "([a-z0-9]{40})\\s+(?:$basename)" + "url": "http://windows.php.net/downloads/releases/sha1sum.txt" } }, "suggest": { diff --git a/resharper-clt.json b/resharper-clt.json index 8a5d7c61fb..07ccd15421 100644 --- a/resharper-clt.json +++ b/resharper-clt.json @@ -15,9 +15,6 @@ "autoupdate": { "url": "https://download.jetbrains.com/resharper/JetBrains.ReSharper.CommandLineTools.$version.zip", "hash": { - "mode": "extract", - "type": "sha256", - "find": "([a-fA-F0-9]{64})\\s+\\*(?:$basename)", "url": "$url.sha256" } } diff --git a/terraform.json b/terraform.json index 774c9338c2..0b4cd2b68d 100644 --- a/terraform.json +++ b/terraform.json @@ -29,9 +29,7 @@ } }, "hash": { - "mode": "extract", - "url": "https://releases.hashicorp.com/terraform/$version/terraform_$version_SHA256SUMS", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://releases.hashicorp.com/terraform/$version/terraform_$version_SHA256SUMS" } } } diff --git a/vagrant.json b/vagrant.json index 36917f62bf..cbc2d3a7f1 100644 --- a/vagrant.json +++ b/vagrant.json @@ -13,9 +13,7 @@ "autoupdate": { "url": "https://releases.hashicorp.com/vagrant/$version/vagrant_$version.msi", "hash": { - "mode": "extract", - "url": "https://releases.hashicorp.com/vagrant/$version/vagrant_$version_SHA256SUMS", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://releases.hashicorp.com/vagrant/$version/vagrant_$version_SHA256SUMS" } } } diff --git a/vault.json b/vault.json index 5f14352858..6185ab1ff5 100644 --- a/vault.json +++ b/vault.json @@ -29,9 +29,7 @@ } }, "hash": { - "mode": "extract", - "url": "https://releases.hashicorp.com/vault/$version/vault_$version_SHA256SUMS", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://releases.hashicorp.com/vault/$version/vault_$version_SHA256SUMS" } } } diff --git a/youtube-dl.json b/youtube-dl.json index f2cdd2ffd4..4d77bc386c 100644 --- a/youtube-dl.json +++ b/youtube-dl.json @@ -14,9 +14,7 @@ "autoupdate": { "url": "https://github.com/rg3/youtube-dl/releases/download/$version/youtube-dl.exe", "hash": { - "mode": "extract", - "url": "https://github.com/rg3/youtube-dl/releases/download/$version/SHA2-256SUMS", - "find": "([a-z0-9]{64})\\s+(?:$basename)" + "url": "https://github.com/rg3/youtube-dl/releases/download/$version/SHA2-256SUMS" } } }