mirror of
https://github.com/ScoopInstaller/Main.git
synced 2025-11-04 15:51:23 +00:00
Merge branch 'upstream' into dev-whitespace
Conflicts: bucket/apache.json bucket/cmake.json bucket/curl.json bucket/git.json bucket/openssl.json bucket/php54.json bucket/php55.json bucket/sliksvn.json lib/core.ps1
This commit is contained in:
commit
b7588ac1b7
@ -1,9 +1,9 @@
|
||||
{
|
||||
"homepage": "http://www.apachelounge.com",
|
||||
"version": "2.4.12",
|
||||
"version": "2.4.16",
|
||||
"license": "Apache 2.0",
|
||||
"url": "http://www.apachelounge.com/download/VC11/binaries/httpd-2.4.12-win32-VC11.zip",
|
||||
"hash": "DBA963DB9819CD2AE3CB0E970F4159E199981F9BA0B33C537395C6AE1222951D",
|
||||
"url": "http://www.apachelounge.com/download/VC11/binaries/httpd-2.4.16-win32-VC11.zip",
|
||||
"hash": "8AD891742E985DB1B7785B49E2C9D517CC953691B4355EE178ECCB58DEED3C0D",
|
||||
"extract_dir": "Apache24",
|
||||
"bin": [
|
||||
"bin\\ab.exe",
|
||||
@ -25,6 +25,6 @@ $root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\
|
||||
",
|
||||
"checkver": {
|
||||
"url": "http://www.apachelounge.com/download/",
|
||||
"re": "Apache ([0-9\\.]+) Win64"
|
||||
"re": "Apache ([0-9\\.]+) Win32"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
"homepage": "http://www.cmake.org/",
|
||||
"version": "3.2.2",
|
||||
"version": "3.3.1",
|
||||
"license": "http://www.cmake.org/licensing/",
|
||||
"url": "http://www.cmake.org/files/v3.2/cmake-3.2.2-win32-x86.zip",
|
||||
"hash": "8728119BBB48468AB45230A579463729E7B12D6BABFA1AD77E771B239B5430DB",
|
||||
"extract_dir": "cmake-3.2.2-win32-x86",
|
||||
"url": "http://www.cmake.org/files/v3.3/cmake-3.3.1-win32-x86.zip",
|
||||
"hash": "618fd27dce2ed83a98740b427e7f9d16577db3e04afb93ba2aca524981044b8b",
|
||||
"extract_dir": "cmake-3.3.1-win32-x86",
|
||||
"bin": [
|
||||
"bin/cmake.exe",
|
||||
"bin/cmcldeps.exe",
|
||||
|
||||
14
curl.json
14
curl.json
@ -1,17 +1,17 @@
|
||||
{
|
||||
"homepage": "http://curl.haxx.se/",
|
||||
"version": "7.39.0",
|
||||
"version": "7.43.0",
|
||||
"licence": "MIT",
|
||||
"architecture": {
|
||||
"64bit": {
|
||||
"url": "http://www.confusedbycode.com/curl/curl-7.39.0-win64.zip",
|
||||
"hash": "946c3ab2625b9352a846e493319978b1ef2818173c711ed8b1bb8c0e04189ee4",
|
||||
"extract_dir": "curl-7.39.0-win64"
|
||||
"url": "http://www.confusedbycode.com/curl/curl-7.43.0-win64.zip",
|
||||
"hash": "ef2eb41ddfbecd7ec4b186decdf7a9257894eb3f75b9624460a1bb34e4941019",
|
||||
"extract_dir": "curl-7.43.0-win64"
|
||||
},
|
||||
"32bit": {
|
||||
"url": "http://www.confusedbycode.com/curl/curl-7.39.0-win32.zip",
|
||||
"hash": "e97a78dc97ece670580cccf735a5ec048513da0a9ba5135d4ae227b7cde68dba",
|
||||
"extract_dir": "curl-7.39.0-win32"
|
||||
"url": "http://www.confusedbycode.com/curl/curl-7.43.0-win32.zip",
|
||||
"hash": "0ff74737d4df54a955c8cb2689dd27abd0e835210951c4401825e95a95273690",
|
||||
"extract_dir": "curl-7.43.0-win32"
|
||||
}
|
||||
},
|
||||
"bin": "bin/curl.exe",
|
||||
|
||||
10
dart.json
10
dart.json
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.11.1",
|
||||
"version": "1.11.3",
|
||||
"license": "BSD",
|
||||
"homepage": "https://www.dartlang.org/",
|
||||
"extract_dir": "dart-sdk",
|
||||
@ -8,12 +8,12 @@
|
||||
],
|
||||
"architecture": {
|
||||
"64bit": {
|
||||
"url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.1/sdk/dartsdk-windows-x64-release.zip",
|
||||
"hash": "8b0dbf2d90055a0de2e8a9bf01500f88a3575ba0457a3c44ce29fd759a553bfb"
|
||||
"url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.3/sdk/dartsdk-windows-x64-release.zip",
|
||||
"hash": "b9415bb8563f48e4d9cb1ab105aab7179c57108b1ce8ed504613e58d589b6c1d"
|
||||
},
|
||||
"32bit": {
|
||||
"url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.1/sdk/dartsdk-windows-ia32-release.zip",
|
||||
"hash": "d2abdfe9c1e44d3c77d2b84e448c5ff14a6e3d45ed39460ed096782f9651bbc1"
|
||||
"url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.3/sdk/dartsdk-windows-ia32-release.zip",
|
||||
"hash": "e1e11eed91b268de33e05a8e3eca7cb1adecbc993319fd5cd2e3e39628165725"
|
||||
}
|
||||
},
|
||||
"checkver": {
|
||||
|
||||
10
git.json
10
git.json
@ -1,15 +1,15 @@
|
||||
{
|
||||
"homepage": "https://git-for-windows.github.io/",
|
||||
"license": "GPL2",
|
||||
"version": "2.4.6.windows.1",
|
||||
"version": "2.5.0.windows.1",
|
||||
"architecture": {
|
||||
"64bit": {
|
||||
"url": "https://github.com/git-for-windows/git/releases/download/v2.4.6.windows.1/PortableGit-2.4.6-5th-release-candidate-64-bit.7z.exe#/dl.7z",
|
||||
"hash": "cc7d8df6edf7bd3689d685a2da7561ca7aee34936e868b475cddd72bfc6f953b"
|
||||
"url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-64-bit.7z.exe#/dl.7z",
|
||||
"hash": "2ace32df8b8449e2b48cc6e4d0152be7f4bf8e7174d0dc43f67a1ae23bf26f9d"
|
||||
},
|
||||
"32bit": {
|
||||
"url": "https://github.com/git-for-windows/git/releases/download/v2.4.6.windows.1/PortableGit-2.4.6-5th-release-candidate-32-bit.7z.exe#/dl.7z",
|
||||
"hash": "1b373b2238f44b0d96ae07a9965399caeb31180bf3cdd6585e3c34a4851dc9c2"
|
||||
"url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-32-bit.7z.exe#/dl.7z",
|
||||
"hash": "207f40828b7ad2f93f27b74443b89540a134d1fd735a849db14df2a0a64d5896"
|
||||
}
|
||||
},
|
||||
"bin": [ "cmd\\git.exe", "cmd\\gitk.exe", "cmd\\git-gui.exe" ],
|
||||
|
||||
10
openssl.json
10
openssl.json
@ -1,15 +1,15 @@
|
||||
{
|
||||
"homepage": "http://slproweb.com/products/Win32OpenSSL.html",
|
||||
"version": "1.0.2b",
|
||||
"version": "1.0.2d",
|
||||
"license": "https://www.openssl.org/source/license.html",
|
||||
"architecture": {
|
||||
"64bit": {
|
||||
"url": "http://slproweb.com/download/Win64OpenSSL-1_0_2b.exe",
|
||||
"hash": "e95f5b70e0275d5766348f4ab8120b5ad82e9af69242665777cb4300dee216a5"
|
||||
"url": "http://slproweb.com/download/Win64OpenSSL-1_0_2d.exe",
|
||||
"hash": "9e62364a75cf7a55ce8167f9a4992aa38c55ba362594e4579e27f9c0758c2284"
|
||||
},
|
||||
"32bit": {
|
||||
"url": "http://slproweb.com/download/Win32OpenSSL-1_0_2b.exe",
|
||||
"hash": "3a017ee86a8e22304dadd960524546fb65ab80cb75b058f46b719ec244c40c23"
|
||||
"url": "http://slproweb.com/download/Win32OpenSSL-1_0_2d.exe",
|
||||
"hash": "68796d75cd8cc5a34d5fa997805a373d2c701179a270efd0a513b197ea15736c"
|
||||
}
|
||||
},
|
||||
"innosetup": true,
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"homepage": "http://windows.php.net",
|
||||
"version": "5.4.43",
|
||||
"version": "5.4.44",
|
||||
"license": "http://www.php.net/license/",
|
||||
"url": "http://windows.php.net/downloads/releases/php-5.4.43-Win32-VC9-x86.zip",
|
||||
"hash": "sha1:cd32e55ba56f6b489b90e06a81e64138792ab858",
|
||||
"url": "http://windows.php.net/downloads/releases/php-5.4.44-Win32-VC9-x86.zip",
|
||||
"hash": "sha1:2fcc47dff254ccae812ce2ccfd4ddf4f21ce9e8d",
|
||||
"bin": "php.exe",
|
||||
"post_install": "cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"",
|
||||
"checkver": {
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"homepage": "http://windows.php.net",
|
||||
"version": "5.5.27",
|
||||
"version": "5.5.28",
|
||||
"license": "http://www.php.net/license/",
|
||||
"url": "http://windows.php.net/downloads/releases/php-5.5.27-Win32-VC11-x86.zip",
|
||||
"hash": "sha1:3a21e4fd310ce19867c79a8dabe6ac24848f97f7",
|
||||
"url": "http://windows.php.net/downloads/releases/php-5.5.28-Win32-VC11-x86.zip",
|
||||
"hash": "sha1:ed8ca7c5726174a04ee50e2cac33e5fabeaacf1f",
|
||||
"bin": "php.exe",
|
||||
"post_install": "cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"",
|
||||
"checkver": {
|
||||
|
||||
10
sliksvn.json
10
sliksvn.json
@ -1,14 +1,14 @@
|
||||
{
|
||||
"homepage": "http://sliksvn.com/",
|
||||
"version": "1.8.10",
|
||||
"version": "1.8.13",
|
||||
"architecture": {
|
||||
"64bit": {
|
||||
"url": "https://sliksvn.com/pub/Slik-Subversion-1.8.10-x64.msi",
|
||||
"hash": "4f90b4f51ccec1cb309022ee2db98be8297a2cdee33ae6ce218d1cf93883a222"
|
||||
"url": "https://sliksvn.com/pub/Slik-Subversion-1.8.13-x64.msi",
|
||||
"hash": "0d4fde7f9113a8b4436a68c74beba7b27e9043002e3fe5730c09f918f606483c"
|
||||
},
|
||||
"32bit": {
|
||||
"url": "https://sliksvn.com/pub/Slik-Subversion-1.8.10-win32.msi",
|
||||
"hash": "7f1e4d9080fb8c591cc354b91bb1ede9c17ab8a3b0dbf5347525f6c79c6e059a"
|
||||
"url": "https://sliksvn.com/pub/Slik-Subversion-1.8.13-win32.msi",
|
||||
"hash": "2852bb8cacbecbbc52cf0d9edba40239daa593343f78b88713eba100119def09"
|
||||
}
|
||||
},
|
||||
"extract_dir": "SlikSvn",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user