From 194acac05b3a888d37d1cf89a4a30ceb26f75798 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 5 Mar 2017 15:01:05 +1100
Subject: [PATCH] Fix validation

---
 bin/wappalyzer-build             |  2 +-
 bin/wappalyzer-validate-regex    |  4 ++--
 src/apps.json                    | 22 +++++++++++-----------
 src/drivers/chrome/manifest.json |  2 +-
 src/drivers/firefox/package.json |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 2b291f8dc..3f973b736 100755
--- a/bin/wappalyzer-build
+++ b/bin/wappalyzer-build
@@ -24,7 +24,7 @@ node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZ
 
 echo "Compressing PNG and SVG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons 2>&1 > /dev/null
 
 echo "Converting SVG icons to PNG..."
 
diff --git a/bin/wappalyzer-validate-regex b/bin/wappalyzer-validate-regex
index 36012c57a..f7976c116 100755
--- a/bin/wappalyzer-validate-regex
+++ b/bin/wappalyzer-validate-regex
@@ -80,7 +80,7 @@ for ( app in json.apps ) {
 		}
 	});
 
-	if ( /[a-z]+:\/\//i.test(json.apps[app].website) ) {
-		throw new Error('Do not include the protocol in the website URL\n' + app + ': ' + json.apps[app].website);
+	if ( !/^https?:\/\//i.test(json.apps[app].website) ) {
+		throw new Error('Invalid website URL\n' + app + ': ' + json.apps[app].website);
 	}
 }
diff --git a/src/apps.json b/src/apps.json
index 245bacaec..7591e6326 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -1846,7 +1846,7 @@
 				"Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"DedeCMS": {
 			"cats": [
@@ -2508,7 +2508,7 @@
 				"Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"Flask": {
 			"cats": [
@@ -3207,7 +3207,7 @@
 				"Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"HTTP/2": {
 			"cats": [
@@ -3257,7 +3257,7 @@
 			},
 			"icon": "default.svg",
 			"implies": "OmniTouch 8660 My Teamwork",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"Haskell": {
 			"cats": [
@@ -6253,7 +6253,7 @@
 				"Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"RBS Change": {
 			"cats": [
@@ -6363,7 +6363,7 @@
 				"Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"React": {
 			"cats": [
@@ -7037,7 +7037,7 @@
 				"Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"Site Meter": {
 			"cats": [
@@ -8169,7 +8169,7 @@
 			"implies": [
 				"HP"
 			],
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"VirtueMart": {
 			"cats": [
@@ -9061,7 +9061,7 @@
 				"Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
 			"icon": "default.svg",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"e107": {
 			"cats": [
@@ -9095,7 +9095,7 @@
 			},
 			"icon": "default.svg",
 			"implies": "HP ProCurve",
-			"website": "http://???"
+			"website": "http://example.com"
 		},
 		"eSyndiCat": {
 			"cats": [
@@ -9960,4 +9960,4 @@
 		"51": "Landing Page Builders",
 		"52": "Live Chat"
 	}
-}
+}
\ No newline at end of file
diff --git a/src/drivers/chrome/manifest.json b/src/drivers/chrome/manifest.json
index fca9595db..95e7d2102 100644
--- a/src/drivers/chrome/manifest.json
+++ b/src/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
 	"description": "Identifies software on the web",
-	"version": "2.50",
+	"version": "2.51",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/src/drivers/firefox/package.json b/src/drivers/firefox/package.json
index be5106364..b688d50d8 100644
--- a/src/drivers/firefox/package.json
+++ b/src/drivers/firefox/package.json
@@ -8,7 +8,7 @@
   "description": "Identifies software on the web",
   "author": "Elbert Alias",
   "license": "GPLv3",
-  "version": "3.2.9",
+  "version": "3.2.10",
 	"main": "driver.js",
 	"preferences": [{
 		"name": "tracking",