From 89defbffc93641a1b02f5f8542621d0a833ad56d Mon Sep 17 00:00:00 2001 From: Richard Kuhnt Date: Fri, 12 May 2017 19:01:00 +0200 Subject: [PATCH] Unify the use of forced local filenames --- apex.json | 16 ++++++++++------ cacert.json | 6 +++--- docker-compose.json | 5 ++--- docker-machine.json | 9 ++++----- dotnet.json | 4 ++-- gow.json | 2 +- gpg.json | 2 +- invoke-build.json | 4 ++-- jq.json | 5 ++--- psake.json | 2 +- thrift.json | 5 ++--- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/apex.json b/apex.json index 8c8cbb2e1f..568d75467e 100644 --- a/apex.json +++ b/apex.json @@ -4,22 +4,26 @@ "version": "0.13.1", "architecture": { "64bit": { - "url": "https://github.com/apex/apex/releases/download/v0.13.1/apex_windows_amd64.exe", + "url": "https://github.com/apex/apex/releases/download/v0.13.1/apex_windows_amd64.exe#/apex.exe", "hash": "b7274c8eec1f367604c92204b4ddafa93b06b71561b1421c3b5086c7bea1b1b7" + }, + "32bit": { + "url": "https://github.com/apex/apex/releases/download/v0.13.1/apex_windows_386.exe#/apex.exe", + "hash": "b7f866b5056cd6505a757af15e2004ff119d0e908fe1e88f64ccf2ec19ac0266" } }, "extract_dir": "apex", - "pre_install": "Rename-Item @(Get-ChildItem $dir\\apex_*.exe)[0] $dir\\apex.exe", - "bin": [ - "apex.exe" - ], + "bin": "apex.exe", "checkver": { "github": "https://github.com/apex/apex" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/apex/apex/releases/download/v$version/apex_windows_amd64.exe" + "url": "https://github.com/apex/apex/releases/download/v$version/apex_windows_amd64.exe#/apex.exe" + }, + "32bit": { + "url": "https://github.com/apex/apex/releases/download/v$version/apex_windows_386.exe#/apex.exe" } } } diff --git a/cacert.json b/cacert.json index b043a99cd2..399e6a7aa3 100644 --- a/cacert.json +++ b/cacert.json @@ -2,14 +2,14 @@ "version": "2017-01-18", "homepage": "https://curl.haxx.se/docs/caextract.html", "license": "MPL 2.0", - "url": "https://curl.haxx.se/ca/cacert-2017-01-18.pem", + "url": "https://curl.haxx.se/ca/cacert-2017-01-18.pem#/cacert.pem", "hash": "e62a07e61e5870effa81b430e1900778943c228bd7da1259dd6a955ee2262b47", "checkver": { "url": "https://curl.haxx.se/docs/caextract.html", "re": "cacert-([\\d-]{10}).pem" }, - "post_install": "Rename-Item @(Get-ChildItem $dir\\cacert-*.pem)[0] $dir\\cacert.pem; if (Test-Path \"$(appdir curl)\") {cp \"$dir\\cacert.pem\" \"$(appdir curl)\\current\\bin\\curl-ca-bundle.crt\"}", + "post_install": "if (Test-Path \"$(appdir curl)\") {cp \"$dir\\cacert.pem\" \"$(appdir curl)\\current\\bin\\curl-ca-bundle.crt\"}", "autoupdate": { - "url": "https://curl.haxx.se/ca/cacert-$version.pem" + "url": "https://curl.haxx.se/ca/cacert-$version.pem#/cacert.pem" } } diff --git a/docker-compose.json b/docker-compose.json index a64f244976..0e11e31ede 100644 --- a/docker-compose.json +++ b/docker-compose.json @@ -4,11 +4,10 @@ "license": "Apache", "architecture": { "64bit": { - "url": "https://github.com/docker/compose/releases/download/1.13.0/docker-compose-Windows-x86_64.exe", + "url": "https://github.com/docker/compose/releases/download/1.13.0/docker-compose-Windows-x86_64.exe#/docker-compose.exe", "hash": "b933e653cd77f1d990d4dda598f1cc8fe8f128d66485569e828c0976602a8d5e" } }, - "pre_install": "Rename-Item @(Get-ChildItem $dir\\docker-compose-*.exe)[0] $dir\\docker-compose.exe", "bin": [ [ "docker-compose.exe", @@ -19,7 +18,7 @@ "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/docker/compose/releases/download/$version/docker-compose-Windows-x86_64.exe" + "url": "https://github.com/docker/compose/releases/download/$version/docker-compose-Windows-x86_64.exe#/docker-compose.exe" } } } diff --git a/docker-machine.json b/docker-machine.json index 83a5c1ee4d..cc085fb051 100644 --- a/docker-machine.json +++ b/docker-machine.json @@ -4,15 +4,14 @@ "license": "Apache", "architecture": { "64bit": { - "url": "https://github.com/docker/machine/releases/download/v0.11.0/docker-machine-Windows-x86_64.exe", + "url": "https://github.com/docker/machine/releases/download/v0.11.0/docker-machine-Windows-x86_64.exe#/docker-machine.exe", "hash": "540a98ad93f52dd1529a4803ef70a5847a97dc1a1f612cdf67201c26cf80c0cc" }, "32bit": { - "url": "https://github.com/docker/machine/releases/download/v0.11.0/docker-machine-Windows-i386.exe", + "url": "https://github.com/docker/machine/releases/download/v0.11.0/docker-machine-Windows-i386.exe#/docker-machine.exe", "hash": "e4ebdb1ea127659e34513e43559e7d964ca365236f652df613ae8671682db44f" } }, - "pre_install": "Rename-Item @(Get-ChildItem $dir\\docker-machine-*.exe)[0] $dir\\docker-machine.exe", "bin": [ [ "docker-machine.exe", @@ -23,10 +22,10 @@ "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/docker/machine/releases/download/v$version/docker-machine-Windows-x86_64.exe" + "url": "https://github.com/docker/machine/releases/download/v$version/docker-machine-Windows-x86_64.exe#/docker-machine.exe" }, "32bit": { - "url": "https://github.com/docker/machine/releases/download/v$version/docker-machine-Windows-i386.exe" + "url": "https://github.com/docker/machine/releases/download/v$version/docker-machine-Windows-i386.exe#/docker-machine.exe" } }, "hash": { diff --git a/dotnet.json b/dotnet.json index f9d03fbc32..c1d3ba2f5c 100644 --- a/dotnet.json +++ b/dotnet.json @@ -3,11 +3,11 @@ "homepage": "https://www.microsoft.com/net/core#windows", "architecture": { "64bit": { - "url": "https://go.microsoft.com/fwlink/?linkid=843454#/dl.zip", + "url": "https://go.microsoft.com/fwlink/?linkid=843454#/dl.7z", "hash": "e729afcf3cc69f17ec7968468b399c843b8b8327523e62c03450e4653115cf76" }, "32bit": { - "url": "https://go.microsoft.com/fwlink/?linkid=843458#/dl.zip", + "url": "https://go.microsoft.com/fwlink/?linkid=843458#/dl.7z", "hash": "3a8d7316dd774d54e27a332c5d1e73d7813fecd10b670249f480ae917226e444" } }, diff --git a/gow.json b/gow.json index d38252b0df..ce1f37dd41 100644 --- a/gow.json +++ b/gow.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/bmatzelle/gow", "version": "0.8.0", - "url": "https://github.com/bmatzelle/gow/releases/download/v0.8.0/Gow-0.8.0.exe#.7z", + "url": "https://github.com/bmatzelle/gow/releases/download/v0.8.0/Gow-0.8.0.exe#/dl.7z", "hash": "9b06e0f9471d61d1019bf4d133c0ed23a4ccee27b6b8758a922d681469b82e42", "extract_dir": "", "checkver": { diff --git a/gpg.json b/gpg.json index 45ddf38857..d2751bc72b 100644 --- a/gpg.json +++ b/gpg.json @@ -1,7 +1,7 @@ { "version": "2.3.3", "license": "GNU", - "url": "https://files.gpg4win.org/gpg4win-2.3.3.exe#dl.7z", + "url": "https://files.gpg4win.org/gpg4win-2.3.3.exe#/dl.7z", "hash": "5675770b85d49cb05fd3e4bdee7528e19991be508760eef86157d1fa01f0f254", "homepage": "https://www.gpg4win.org", "bin": [ diff --git a/invoke-build.json b/invoke-build.json index 9caddf506d..ab982a4ef0 100644 --- a/invoke-build.json +++ b/invoke-build.json @@ -2,7 +2,7 @@ "version": "3.3.7", "license": "Apache 2.0", "extract_dir": "tools", - "url": "http://nuget.org/api/v2/package/Invoke-Build/3.3.7#.zip", + "url": "http://nuget.org/api/v2/package/Invoke-Build/3.3.7#/dl.7z", "homepage": "https://github.com/nightroman/Invoke-Build", "hash": "a837cded0bdde2eed544a8a94f84c786db7bd7aaa3adac66b0bb487ce3b7fdac", "env_add_path": ".", @@ -11,6 +11,6 @@ "re": "releases/tag/v([\\d.]+)" }, "autoupdate": { - "url": "http://nuget.org/api/v2/package/Invoke-Build/$version#.zip" + "url": "http://nuget.org/api/v2/package/Invoke-Build/$version#/dl.7z" } } diff --git a/jq.json b/jq.json index f9b5c597dc..8988756fb5 100644 --- a/jq.json +++ b/jq.json @@ -3,14 +3,13 @@ "license": "http://creativecommons.org/licenses/by/3.0/", "architecture": { "32bit": { - "url": "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win32.exe" + "url": "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win32.exe#/jq.exe" }, "64bit": { - "url": "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win64.exe" + "url": "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win64.exe#/jq.exe" } }, "homepage": "http://stedolan.github.io/jq/", - "pre_install": "Rename-Item @(Get-ChildItem $dir\\jq-*.exe)[0] $dir\\jq.exe", "bin": "jq.exe", "checkver": { "url": "https://github.com/stedolan/jq/releases/latest", diff --git a/psake.json b/psake.json index f2857b980e..974c7d5322 100644 --- a/psake.json +++ b/psake.json @@ -1,6 +1,6 @@ { "version": "4.6.0", - "url": "http://nuget.org/api/v2/package/psake/4.6.0#.zip", + "url": "http://nuget.org/api/v2/package/psake/4.6.0#/dl.7z", "homepage": "https://github.com/psake/psake", "hash": "7086265CAC31078542D41F128AEA7E0F734CBD56511A322DD1A183B96849AD93", "bin": "psake.ps1", diff --git a/thrift.json b/thrift.json index f32ca87a15..fb56c24c42 100644 --- a/thrift.json +++ b/thrift.json @@ -2,12 +2,11 @@ "homepage": "https://thrift.apache.org/", "version": "0.10.0", "license": "Apache License v2.0", - "url": "https://www-us.apache.org/dist/thrift/0.10.0/thrift-0.10.0.exe", + "url": "https://www-us.apache.org/dist/thrift/0.10.0/thrift-0.10.0.exe#/thrift.exe", "hash": "85aca25c5193c48ec6cc1c0a4c40fac5ea3fde2192c2ffaaad92a9b56d7a8f9a", "bin": "thrift.exe", - "pre_install": "Rename-Item @(Get-ChildItem $dir\\thrift-*.exe)[0] $dir\\thrift.exe", "checkver": "Apache\\s+Thrift\\s+v([\\d.]+)", "autoupdate": { - "url": "https://www-us.apache.org/dist/thrift/$version/thrift-$version.exe" + "url": "https://www-us.apache.org/dist/thrift/$version/thrift-$version.exe#/thrift.exe" } }