From dceeaf5845aa434571f464c18925e4c0e313141a Mon Sep 17 00:00:00 2001 From: issaclin32 Date: Tue, 27 Aug 2019 22:10:47 +0800 Subject: [PATCH 1/6] Update chromium.json --- bucket/chromium.json | 46 ++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/bucket/chromium.json b/bucket/chromium.json index 7dcc0e576f7302..dcf926a09db39a 100644 --- a/bucket/chromium.json +++ b/bucket/chromium.json @@ -1,37 +1,49 @@ { - "version": "75.0.3770.142-r652427", - "description": "An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", + "##": "Check chromium.woolyss.com for different versions of Chromium releases.", + "version": "76.0.3809.100-r665002", + "description": "Open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", "license": "BSD-3-Clause", "homepage": "https://www.chromium.org", - "checkver": { - "url": "https://chromium.woolyss.com/api/v3/?os=windows&bit=64&type=stable-codecs-sync&out=string", - "re": "v([\\d.]+-r(?:\\d+))-win64" + "architecture": { + "64bit": { + "url": "https://github.com/macchrome/winchrome/releases/download/v76.0.3809.100-r665002-Win64/Chromium-76.0.3809.100-x64.7z", + "hash": "sha1:67fda51228441ec59bdbfa4de046f4ea4f4d551b", + "extract_dir": "Chromium-76.0.3809.100-x64" + }, + "32bit": { + "url": "https://github.com/macchrome/winchrome/releases/download/v76.0.3809.100-r665002-Win64/Chromium-76.0.3809.100-x86.7z", + "hash": "sha1:b3a9c7bfaf220ba2f0868047e1043b74246a9c96", + "extract_dir": "Chromium-76.0.3809.100-x86" + } }, "bin": "chrome.exe", - "extract_dir": "chrome-win32", "shortcuts": [ [ "chrome.exe", "Chromium" ] ], - "architecture": { - "64bit": { - "url": "https://github.com/henrypp/chromium/releases/download/v75.0.3770.142-r652427-win64/chromium-sync.zip", - "hash": "9b70c145471e8bcd4d717e0c6d736e1cb94c9710f18a5638f5cc1175418d9e0b" - }, - "32bit": { - "url": "https://github.com/henrypp/chromium/releases/download/v75.0.3770.142-r652427-win32/chromium-sync.zip", - "hash": "bc33cf72da162dc90374957ed2d4e9e8026b51caca1290122a4e0cba218d04cb" - } + "checkver": { + "github": "https://github.com/macchrome/winchrome", + "regex": "v((?
[\\d.]+)-r\\d+)-Win64" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/henrypp/chromium/releases/download/v$version-win64/chromium-sync.zip" + "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchMain-x64.7z", + "hash": { + "url": "https://github.com/macchrome/winchrome/releases/latest", + "regex": "(?sm)$basename \\(64-bit\\)
\\nSHA1 $sha1

" + }, + "extract_dir": "Chromium-$matchMain-x64" }, "32bit": { - "url": "https://github.com/henrypp/chromium/releases/download/v$version-win32/chromium-sync.zip" + "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchMain-x86.7z", + "hash": { + "url": "https://github.com/macchrome/winchrome/releases/latest", + "regex": "(?sm)$basename \\(32-bit\\)
\\nSHA1 $sha1

" + }, + "extract_dir": "Chromium-$matchMain-x86" } } } From 593c3247eff8b4b73ee514ad6f33799ec287baa1 Mon Sep 17 00:00:00 2001 From: issaclin32 Date: Tue, 27 Aug 2019 22:48:19 +0800 Subject: [PATCH 2/6] Autoupdate: Use version tag instead of "latest" --- bucket/chromium.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bucket/chromium.json b/bucket/chromium.json index dcf926a09db39a..1df0e486c7f481 100644 --- a/bucket/chromium.json +++ b/bucket/chromium.json @@ -32,7 +32,7 @@ "64bit": { "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchMain-x64.7z", "hash": { - "url": "https://github.com/macchrome/winchrome/releases/latest", + "url": "https://github.com/macchrome/winchrome/releases/v$version-Win64", "regex": "(?sm)$basename \\(64-bit\\)
\\nSHA1 $sha1

" }, "extract_dir": "Chromium-$matchMain-x64" @@ -40,7 +40,7 @@ "32bit": { "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchMain-x86.7z", "hash": { - "url": "https://github.com/macchrome/winchrome/releases/latest", + "url": "https://github.com/macchrome/winchrome/releases/v$version-Win64", "regex": "(?sm)$basename \\(32-bit\\)
\\nSHA1 $sha1

" }, "extract_dir": "Chromium-$matchMain-x86" From 4feeb2728d52f4f117ffd7489d872b1555fbcf49 Mon Sep 17 00:00:00 2001 From: issaclin32 Date: Tue, 27 Aug 2019 23:32:06 +0800 Subject: [PATCH 3/6] Apply suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jakub Čábera --- bucket/chromium.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bucket/chromium.json b/bucket/chromium.json index 1df0e486c7f481..5e051667d5bcc8 100644 --- a/bucket/chromium.json +++ b/bucket/chromium.json @@ -25,25 +25,25 @@ ], "checkver": { "github": "https://github.com/macchrome/winchrome", - "regex": "v((?
[\\d.]+)-r\\d+)-Win64" + "regex": "v([\\d.]+-r\\d+)-Win64" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchMain-x64.7z", + "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchHead.$buildVersion-x64.7z", "hash": { "url": "https://github.com/macchrome/winchrome/releases/v$version-Win64", "regex": "(?sm)$basename \\(64-bit\\)
\\nSHA1 $sha1

" }, - "extract_dir": "Chromium-$matchMain-x64" + "extract_dir": "Chromium-$matchHead.$buildVersion-x64" }, "32bit": { - "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchMain-x86.7z", + "url": "https://github.com/macchrome/winchrome/releases/download/v$version-Win64/Chromium-$matchHead.$buildVersion-x86.7z", "hash": { "url": "https://github.com/macchrome/winchrome/releases/v$version-Win64", "regex": "(?sm)$basename \\(32-bit\\)
\\nSHA1 $sha1

" }, - "extract_dir": "Chromium-$matchMain-x86" + "extract_dir": "Chromium-$matchHead.$buildVersion-x86" } } } From 970e202591f49f16a3b631a58c093901cedf0515 Mon Sep 17 00:00:00 2001 From: issaclin32 Date: Wed, 28 Aug 2019 14:05:53 +0800 Subject: [PATCH 4/6] Apply suggestion (description) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jakub Čábera --- bucket/chromium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bucket/chromium.json b/bucket/chromium.json index 5e051667d5bcc8..ba5a879d2e15be 100644 --- a/bucket/chromium.json +++ b/bucket/chromium.json @@ -1,7 +1,7 @@ { "##": "Check chromium.woolyss.com for different versions of Chromium releases.", "version": "76.0.3809.100-r665002", - "description": "Open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", + "description": "Browser aiming for safer, faster, and more stable way for all users to experience the web.", "license": "BSD-3-Clause", "homepage": "https://www.chromium.org", "architecture": { From 6504b78029d17d7e0a2275eb2ebf13ca22903ed5 Mon Sep 17 00:00:00 2001 From: issaclin32 Date: Wed, 28 Aug 2019 14:06:10 +0800 Subject: [PATCH 5/6] Apply suggestion (bin) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jakub Čábera --- bucket/chromium.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bucket/chromium.json b/bucket/chromium.json index ba5a879d2e15be..3cbcf36594fea0 100644 --- a/bucket/chromium.json +++ b/bucket/chromium.json @@ -16,7 +16,13 @@ "extract_dir": "Chromium-76.0.3809.100-x86" } }, - "bin": "chrome.exe", + "bin": [ + "chrome.exe", + [ + "chrome.exe", + "chromium" + [ + ], "shortcuts": [ [ "chrome.exe", From 7dad0bc3f3f8c0ce7c3748a52e85ae6acdb3e37b Mon Sep 17 00:00:00 2001 From: issaclin32 Date: Wed, 28 Aug 2019 14:06:52 +0800 Subject: [PATCH 6/6] bin: fix bracket --- bucket/chromium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bucket/chromium.json b/bucket/chromium.json index 3cbcf36594fea0..65dc590fe903aa 100644 --- a/bucket/chromium.json +++ b/bucket/chromium.json @@ -21,7 +21,7 @@ [ "chrome.exe", "chromium" - [ + ] ], "shortcuts": [ [