From 670771c8ad9cbb6f17e5aa30e39782ec91363d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= <wangxinhe06@gmail.com>
Date: Sun, 31 May 2020 22:26:54 +0800
Subject: [PATCH 1/2] Improve Font Awesome Detection

---
 src/apps.json              |   8 ++++----
 src/icons/Font Awesome.png | Bin 590 -> 0 bytes
 src/icons/font-awesome.svg |   1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 src/icons/Font Awesome.png
 create mode 100644 src/icons/font-awesome.svg

diff --git a/src/apps.json b/src/apps.json
index 666f8b3f1..a330f3bc7 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -3785,11 +3785,11 @@
       ],
       "html": [
         "<link[^>]* href=[^>]+(?:([\\d.]+)/)?(?:css/)?font-awesome(?:\\.min)?\\.css\\;version:\\1",
-        "<link[^>]* href=\"https://use\\.fontawesome\\.com/releases/v([^>]+)/css/\\;version:\\1",
-        "<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
+        "<link[^>]* href=(?:\".*?|[^>]*?)(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:.*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|).*?>\\;version:\\1"
       ],
-      "icon": "Font Awesome.png",
-      "website": "http://fontawesome.io"
+      "script": "(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:.*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)\\;version:\\1",
+      "icon": "font-awesome.svg",
+      "website": "https://fontawesome.com/"
     },
     "Fork CMS": {
       "cats": [
diff --git a/src/icons/Font Awesome.png b/src/icons/Font Awesome.png
deleted file mode 100644
index 4a9568af1984aa51a04e8ff7cf2c46acc42701db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006NNkl<ZSi@sr
z00KEVIROq1jusXcmJ6(`toLY%L3VI*a<<6G$OtgNEC&jn1~UKC6NBuOm6hdZ0Q$U<
z-j>5K(C!8XW@hHo1LXjy-3-?T$^lTjQ5^tGC<oZs*vf!-1CalZt_}cNe%R2^kPRdl
z9v;rb&d$Dst_}bv3M9bI%^ibHBNG$TH(>l-h2qcD41s-`nwqR2L2GMkPzcONN-%GL
z{AmIL0uDAdHf%6QMn^|82?+_A0Ok6D4tqx+>pcY8u@`R|;N|5l2MGexKmd^X3$*wt
z7Z+C%u)GjtAOIvKCB=ZD*bLP349Vf2K$ZeSGg(<#nFq)>#p?i|!fvQ}2|ypcmynQ<
zW*`v&3mA5wK6!C*aRq5<X>MO%Uq&QpW1<}Z4AvbC)Ca^n02rLxMjbHffKdkwI|l&G
zv?9v^Jv}`PQa}J~&t(FO*403K5m>fg1k#&;>Pmr93WO|ob#-L|s+~rP1GcNGsxtBO
z^IHMyhBb_gj6ZNyG(fqZKs8GR1qF4`ie3hw8SFqa+<=bVjn>8>SQmT-YB~fo{4cRp
zEKuz)pq`yT$8-R38<4#cSOGmIx<!QSfB|WejXD6Bvd;r?1rYBU5C_n`Sq@C0rv}Oa
zz)(H~Dw%2ruxnP!0PLmm0`uxIdRq>%6WDg-1t)h!MMYj<5nBxuJPyRyXpD~oTiMkh
cJ3)2>0FeK~sSqmESpWb407*qoM6N<$f|7{k6aWAK

diff --git a/src/icons/font-awesome.svg b/src/icons/font-awesome.svg
new file mode 100644
index 000000000..8c1d44528
--- /dev/null
+++ b/src/icons/font-awesome.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M397.8 32H50.2C22.7 32 0 54.7 0 82.2v347.6C0 457.3 22.7 480 50.2 480h347.6c27.5 0 50.2-22.7 50.2-50.2V82.2c0-27.5-22.7-50.2-50.2-50.2zm-45.4 284.3c0 4.2-3.6 6-7.8 7.8-16.7 7.2-34.6 13.7-53.8 13.7-26.9 0-39.4-16.7-71.7-16.7-23.3 0-47.8 8.4-67.5 17.3-1.2.6-2.4.6-3.6 1.2V385c0 1.8 0 3.6-.6 4.8v1.2c-2.4 8.4-10.2 14.3-19.1 14.3-11.3 0-20.3-9-20.3-20.3V166.4c-7.8-6-13.1-15.5-13.1-26.3 0-18.5 14.9-33.5 33.5-33.5 18.5 0 33.5 14.9 33.5 33.5 0 10.8-4.8 20.3-13.1 26.3v18.5c1.8-.6 3.6-1.2 5.4-2.4 18.5-7.8 40.6-14.3 61.5-14.3 22.7 0 40.6 6 60.9 13.7 4.2 1.8 8.4 2.4 13.1 2.4 22.7 0 47.8-16.1 53.8-16.1 4.8 0 9 3.6 9 7.8v140.3z"/></svg>
\ No newline at end of file

From 75f53f80fac372fb905b5bcfcba915710d14a8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= <wangxinhe06@gmail.com>
Date: Sun, 31 May 2020 22:43:38 +0800
Subject: [PATCH 2/2] Use `[^<]*` instead of `.*`

---
 src/apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps.json b/src/apps.json
index a330f3bc7..9421e3e96 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -3785,7 +3785,7 @@
       ],
       "html": [
         "<link[^>]* href=[^>]+(?:([\\d.]+)/)?(?:css/)?font-awesome(?:\\.min)?\\.css\\;version:\\1",
-        "<link[^>]* href=(?:\".*?|[^>]*?)(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:.*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|).*?>\\;version:\\1"
+        "<link[^>]* href=[^>]*?(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)\\;version:\\1"
       ],
       "script": "(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:.*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)\\;version:\\1",
       "icon": "font-awesome.svg",