From ff6176570df9b28458879a00e2b70229a588ffdd Mon Sep 17 00:00:00 2001
From: Hsiao-nan Cheung <niheaven@gmail.com>
Date: Thu, 16 Mar 2023 14:58:02 +0800
Subject: [PATCH] (min)git: Simplify checkver (#4565)

---
 bucket/git.json            | 8 ++++----
 bucket/mingit-busybox.json | 8 ++++----
 bucket/mingit.json         | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bucket/git.json b/bucket/git.json
index 40e17114cc..a12f4dac8a 100644
--- a/bucket/git.json
+++ b/bucket/git.json
@@ -61,20 +61,20 @@
     },
     "checkver": {
         "github": "https://github.com/git-for-windows/git",
-        "regex": "v([\\w.]+)/PortableGit-(?<full>[\\w.]+)-64-bit"
+        "regex": "tag/v([\\d.]+\\.windows\\.\\d)"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/git-for-windows/git/releases/download/v$version/PortableGit-$matchFull-64-bit.7z.exe#/dl.7z"
+                "url": "https://github.com/git-for-windows/git/releases/download/v$version/PortableGit-$matchHead-64-bit.7z.exe#/dl.7z"
             },
             "32bit": {
-                "url": "https://github.com/git-for-windows/git/releases/download/v$version/PortableGit-$matchFull-32-bit.7z.exe#/dl.7z"
+                "url": "https://github.com/git-for-windows/git/releases/download/v$version/PortableGit-$matchHead-32-bit.7z.exe#/dl.7z"
             }
         },
         "hash": {
             "url": "https://github.com/git-for-windows/git/releases/tag/v$version",
-            "regex": "<td>$basename</td>\\s*<td>$sha256</td>"
+            "regex": "(?s)$basename.*?$sha256"
         }
     }
 }
diff --git a/bucket/mingit-busybox.json b/bucket/mingit-busybox.json
index d3a41be0b8..685172ba58 100644
--- a/bucket/mingit-busybox.json
+++ b/bucket/mingit-busybox.json
@@ -30,20 +30,20 @@
     },
     "checkver": {
         "github": "https://github.com/git-for-windows/git",
-        "regex": "v([\\w.]+)/MinGit-(?<full>[\\w.]+)-64-bit"
+        "regex": "tag/v([\\d.]+\\.windows\\.\\d)"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchFull-busybox-64-bit.zip"
+                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchHead-busybox-64-bit.zip"
             },
             "32bit": {
-                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchFull-busybox-32-bit.zip"
+                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchHead-busybox-32-bit.zip"
             }
         },
         "hash": {
             "url": "https://github.com/git-for-windows/git/releases/tag/v$version",
-            "regex": "<td>$basename</td>\\s*<td>$sha256</td>"
+            "regex": "(?s)$basename.*?$sha256"
         }
     }
 }
diff --git a/bucket/mingit.json b/bucket/mingit.json
index 426aeb8efc..7aad335873 100644
--- a/bucket/mingit.json
+++ b/bucket/mingit.json
@@ -27,20 +27,20 @@
     },
     "checkver": {
         "github": "https://github.com/git-for-windows/git",
-        "regex": "v([\\w.]+)/MinGit-(?<full>[\\w.]+)-64-bit"
+        "regex": "tag/v([\\d.]+\\.windows\\.\\d)"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchFull-64-bit.zip"
+                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchHead-64-bit.zip"
             },
             "32bit": {
-                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchFull-32-bit.zip"
+                "url": "https://github.com/git-for-windows/git/releases/download/v$version/MinGit-$matchHead-32-bit.zip"
             }
         },
         "hash": {
             "url": "https://github.com/git-for-windows/git/releases/tag/v$version",
-            "regex": "<td>$basename</td>\\s*<td>$sha256</td>"
+            "regex": "(?s)$basename.*?$sha256"
         }
     }
 }