From 0a63ef2ddd3efbf2fee4d3cf6f980792f065dd57 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Fri, 9 Feb 2018 12:48:57 +1100
Subject: [PATCH] Build v5.4.7

---
 src/apps.json                          | 46 ++++++++++++--------------
 src/drivers/npm/package.json           |  2 +-
 src/drivers/webextension/js/driver.js  | 10 +++---
 src/drivers/webextension/manifest.json |  2 +-
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 1736f26d4..bb76aa837 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -656,7 +656,7 @@
         22
       ],
       "headers": {
-        "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1"
+        "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1"
       },
       "icon": "Apache.svg",
       "website": "http://apache.org"
@@ -695,7 +695,7 @@
       ],
       "headers": {
         "Server": "^Apache-Coyote(/1\\.1)?$\\;version:\\1?4.1+:",
-        "X-Powered-By": "\\bTomcat\\b(?:-([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache Tomcat.svg",
       "implies": "Java",
@@ -1244,7 +1244,7 @@
       ],
       "html": [
         "(?:<!--|<BR>)Copyright\\(C\\) [\\d-]+ Brother Industries",
-        "<TITLE>\\n\\s*BROTHER "
+        "<TITLE>\n\\s*BROTHER "
       ],
       "icon": "Brother.png",
       "website": "http://www.brother.com"
@@ -2047,7 +2047,7 @@
       ],
       "headers": {
         "Set-Cookie": "^CraftSessionId=",
-        "X-Powered-By": "\\bCraft CMS\\b"
+        "X-Powered-By": "\bCraft CMS\b"
       },
       "icon": "Craft CMS.svg",
       "implies": "Yii",
@@ -2058,7 +2058,7 @@
         6
       ],
       "headers": {
-        "X-Powered-By": "\\bCraft Commerce\\b"
+        "X-Powered-By": "\bCraft Commerce\b"
       },
       "icon": "Craft CMS.svg",
       "implies": "Craft CMS",
@@ -3206,7 +3206,7 @@
         "FTB_API": "",
         "FTB_AddEvent": ""
       },
-      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
+      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
       "icon": "FreeTextBox.png",
       "implies": "Microsoft ASP.NET",
       "website": "http://freetextbox.com"
@@ -3529,7 +3529,7 @@
         "Set-Cookie": "i_like_gogits="
       },
       "html": [
-        "<div class=\"ui left\">\\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
+        "<div class=\"ui left\">\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
         "<button class=\"ui basic clone button\" id=\"repo-clone-ssh\" data-link=\"gogs@"
       ],
       "icon": "gogs.png",
@@ -3901,7 +3901,7 @@
         22
       ],
       "headers": {
-        "Server": "(?:^|[^-])\\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
+        "Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
       },
       "website": "http://example.com"
     },
@@ -5419,7 +5419,7 @@
         27
       ],
       "headers": {
-        "X-Powered-By": "\\bLua(?: ([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "\bLua(?: ([\\d.]+))?\\;version:\\1"
       },
       "icon": "Lua.png",
       "website": "http://www.lua.org"
@@ -5930,7 +5930,7 @@
       "cats": [
         2
       ],
-      "html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\\n<!--End of copyright link",
+      "html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\n<!--End of copyright link",
       "icon": "MiniBB.png",
       "website": "http://www.minibb.com"
     },
@@ -6264,14 +6264,10 @@
         12
       ],
       "js": {
-        "Mustache": "",
         "Mustache.version": "(.*)\\;version:\\1"
       },
       "icon": "Mustache.png",
       "script": "mustache(?:\\.min)?\\.js",
-      "js": {
-        "Mustache.version": "(.*)\\;version:\\1"
-      },
       "website": "https://mustache.github.io"
     },
     "MyBB": {
@@ -6665,7 +6661,7 @@
         50
       ],
       "headers": {
-        "Set-Cookie": "\\bOJSSID\\b"
+        "Set-Cookie": "\bOJSSID\b"
       },
       "icon": "Open Journal Systems.png",
       "implies": "PHP",
@@ -7163,7 +7159,7 @@
         27
       ],
       "headers": {
-        "Server": "\\bPerl\\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
+        "Server": "\bPerl\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
       },
       "icon": "Perl.png",
       "website": "http://perl.org"
@@ -10326,7 +10322,7 @@
         "webix": ""
       },
       "icon": "Webix.png",
-      "script": "\\bwebix\\.js",
+      "script": "\bwebix\\.js",
       "website": "http://webix.com"
     },
     "Webs": {
@@ -10448,7 +10444,7 @@
         28
       ],
       "headers": {
-        "Server": "\\bWinCE\\b"
+        "Server": "\bWinCE\b"
       },
       "icon": "Microsoft.svg",
       "website": "http://microsoft.com"
@@ -11156,7 +11152,7 @@
         22
       ],
       "headers": {
-        "Server": "\\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
+        "Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
       },
       "implies": "HP ProCurve",
       "website": "http://example.com"
@@ -11213,7 +11209,7 @@
       ],
       "icon": "git.svg",
       "meta": {
-        "generator": "\\bgit/([\\d.]+\\d)\\;version:\\1"
+        "generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
       },
       "website": "http://git-scm.com"
     },
@@ -11489,7 +11485,7 @@
         33
       ],
       "headers": {
-        "Server": "\\b(?:mod_)?DAV\\b(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "\b(?:mod_)?DAV\b(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache.svg",
       "implies": "Apache",
@@ -11717,7 +11713,7 @@
       "headers": {
         "Set-Cookie": "^phpbb"
       },
-      "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
+      "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
       "icon": "phpBB.png",
       "implies": "PHP",
       "meta": {
@@ -11914,7 +11910,7 @@
         22
       ],
       "headers": {
-        "Server": "\\bthttpd(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "\bthttpd(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "thttpd.png",
       "website": "http://acme.com/software/thttpd"
@@ -12209,8 +12205,8 @@
         6
       ],
       "excludes": [
-         "WordPress",
-         "WooCommerce"
+        "WordPress",
+        "WooCommerce"
       ],
       "meta": {
         "generator": "^Woosa$"
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index ca7ac32dd..f6b5cf37c 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "5.4.5",
+  "version": "5.4.7",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 4c36f9729..bce13cb97 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -19,7 +19,7 @@ browser.tabs.onRemoved.addListener(tabId => {
 /**
  * Get a value from localStorage
  */
-function getOption(name, defaultValue) {
+function getOption(name, defaultValue = null) {
   return new Promise((resolve, reject) => {
     const callback = item => {
       options[name] = item.hasOwnProperty(name) ? item[name] : defaultValue;
@@ -103,10 +103,10 @@ getOption('version')
       getOption('upgradeMessage', true)
         .then(upgradeMessage => {
           if ( upgradeMessage ) {
-            openTab({
-              url: wappalyzer.config.websiteURL + 'upgraded?v' + version,
-              background: true
-            });
+            // openTab({
+            //   url: wappalyzer.config.websiteURL + 'upgraded?v' + version,
+            //   background: true
+            // });
           }
         });
     }
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 39c22718e..de6e15489 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -4,7 +4,7 @@
 	"author": "Elbert Alias",
 	"homepage_url": "https://www.wappalyzer.com",
 	"description": "Identify web technologies",
-	"version": "5.4.5",
+	"version": "5.4.7",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {