From 791a3f3edebee8b54c45166398db1908db9bac5d Mon Sep 17 00:00:00 2001 From: Telford-Rowley Date: Mon, 11 Nov 2013 10:52:44 +0300 Subject: [PATCH 1/7] Minor regex bugs --- share/apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/apps.json b/share/apps.json index 3651c0f4e..c36a4372b 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1908,7 +1908,7 @@ "osCommerce": { "website": "www.oscommerce.com", "cats": [ 6 ], - "html": "(?:]*(?:\\?|&)osCsid|Powered by (?:<[^]+>)?osCommerce|<[^]+class=\"[^>]*infoBoxHeading)", + "html": "(?:]*(?:\\?|&)osCsid|Powered by (?:<[^>]+>)?osCommerce|<[^>]+class=\"[^>]*infoBoxHeading)", "headers": { "Set-Cookie": "osCsid=" } }, "osCSS": { @@ -2085,7 +2085,7 @@ "Powergap": { "website": "powergap.de", "cats": [ 6 ], - "html": "s\\d\\d\\.php\\?shopid=\\1" + "html": "(s\\d\\d)\\.php\\?shopid=\\1" }, "Prefix-Free": { "website": "http://leaverou.github.io/prefixfree/", From 415fd9a479629bf2a3a11b44704e3b0d45d0bee1 Mon Sep 17 00:00:00 2001 From: damien Date: Thu, 14 Nov 2013 23:33:33 +0100 Subject: [PATCH 2/7] Add AngularJS's version detection pattern (based on script tags) --- share/apps.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index c36a4372b..cdebd42f0 100644 --- a/share/apps.json +++ b/share/apps.json @@ -158,7 +158,8 @@ "AngularJS": { "website": "angularjs.org", "cats": [ 12 ], - "env": "^angular$" + "env": "^angular$", + "script": [ "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "/([\\d.]+(\\-?rc[.\\d]*)*)/angular(\\.min)?\\.js\\;version:\\1", "angular.*\\.js" ] }, "AOLserver": { "website": "aolserver.com", From 4fae112cd9b40f73fa869e25fcaaf7259876ab22 Mon Sep 17 00:00:00 2001 From: Janpot Date: Mon, 18 Nov 2013 19:04:19 +0100 Subject: [PATCH 3/7] Don't add version string if it already exists I reuse a Wappalyzer object and this keeps adding version strings, even when they are already in the array --- share/js/wappalyzer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js index 06645a6d4..013b4268d 100644 --- a/share/js/wappalyzer.js +++ b/share/js/wappalyzer.js @@ -95,7 +95,7 @@ var wappalyzer = (function() { version = version.replace('\\' + i, match ? match : ''); }); - if ( version ) { + if ( version && this.versions.indexOf(version) < 0 ) { this.versions.push(version); } From 11eddcd37939e7589fdd81b65628d33bd47a5e99 Mon Sep 17 00:00:00 2001 From: Alessandro Lepore Date: Wed, 20 Nov 2013 08:32:37 +0100 Subject: [PATCH 4/7] better support of recent spree stores --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index cdebd42f0..76c643ca0 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2415,7 +2415,7 @@ "Spree": { "website": "spreecommerce.com", "cats": [ 6 ], - "html": "]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>", + "html": "(]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|Spree\\.)", "implies": "Ruby on Rails" }, "SQL Buddy": { From aabba6696dd3ec294a759fa29f09a558c2a36ffc Mon Sep 17 00:00:00 2001 From: Alessandro Lepore Date: Wed, 20 Nov 2013 08:32:56 +0100 Subject: [PATCH 5/7] Spree Commerce changed the company logo --- share/images/icons/Spree.png | Bin 554 -> 502 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/images/icons/Spree.png b/share/images/icons/Spree.png index 88b593baf9636fee9c06e2d4bdff018a61c15852..29e27d40ff3bf0d074f0469c2fa24683ab5cd947 100644 GIT binary patch delta 477 zcmV<30V4jY1oi`vBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_ z00EXsL_t(I%VS^|1p^NlCm(nyaQgA5^{mWH27WrCr5mrj&Sqg^RA6UeI-nuOweaYJ zkM&w&+yX!T{#*I+`=5eefBzkKP!>$scKyu)Zgyr%rmw&M#ee)~U{r8b7jk50W;*lb z=U;_FdpX0mUw;QYeE&m%la=X%k_czu!*}1)eYHh0KL7k{x#Py$MiW`S55NEXU%@z-SAO8OP|5m_HPwc|9LywHU{r(rAC&jaY z5jjM+UU}`HCH3g!y*H|5BfBN=D^5orhrPB{2KLxShetxV*v;jAs9}k+mH|*=OlU0X6 z1}r>Qbbj^ef|Ga+SakexQsL^W)2lYz>3sa|gVL_6y$gGH27mtV*%|bI*1^cP_g>$% zSajl1(yFu1!m%1)+;;e;K+(?sAY8ikRv$?0z>NvBXB~)q`~1TlqkFGEsc_}*`|ma7 z9tzca-zwD}c=`6rPoY15|1f_2@kt0IU$f~>JIL^92Os3&4TIt} zSEqm!PTF_B@PE~(A0kiRf0MlY^pmz$ Date: Wed, 20 Nov 2013 13:44:30 +0100 Subject: [PATCH 6/7] more accurate spree match --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 76c643ca0..930539a73 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2415,7 +2415,7 @@ "Spree": { "website": "spreecommerce.com", "cats": [ 6 ], - "html": "(]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|Spree\\.)", + "html": "(]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|Spree\\.routes|Spree\\.translations|Spree\\.api_key)", "implies": "Ruby on Rails" }, "SQL Buddy": { From adc3641f0bb9c440c9eea2c60e1d01cf44377a83 Mon Sep 17 00:00:00 2001 From: Alessandro Lepore Date: Wed, 20 Nov 2013 14:02:48 +0100 Subject: [PATCH 7/7] avoid to match plain text --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 930539a73..d9958ed12 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2415,7 +2415,7 @@ "Spree": { "website": "spreecommerce.com", "cats": [ 6 ], - "html": "(]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|Spree\\.routes|Spree\\.translations|Spree\\.api_key)", + "html": "(]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|