Merge pull request #21 from revolter/fix/failing-build

Project: Fixed failing build

_includes/custom-head.html

@@ -1,9 +1,2 @@
-<link rel="apple-touch-icon" sizes="180x180" href="{% link /assets/images/favicon/apple-touch-icon.png %}?v=2">
-<link rel="icon" type="image/png" sizes="32x32" href="{% link /assets/images/favicon/favicon-32x32.png %}?v=2">
-<link rel="icon" type="image/png" sizes="16x16" href="{% link /assets/images/favicon/favicon-16x16.png %}?v=2">
-<link rel="manifest" href="{% link /assets/images/favicon/site.webmanifest %}?v=2">
-<link rel="mask-icon" href="{% link /assets/images/favicon/safari-pinned-tab.svg %}?v=2" color="#5bbad5">
-<link rel="shortcut icon" href="{% link /assets/images/favicon/favicon.ico %}?v=2">
-<meta name="msapplication-TileColor" content="#da532c">
-<meta name="msapplication-config" content="{% link /assets/images/favicon/browserconfig.xml %}?v=2">
-<meta name="theme-color" content="#ffffff">
+
+{% include favicon.html %}

_includes/favicon.html

@@ -0,0 +1,9 @@
+<link rel="apple-touch-icon" sizes="180x180" href="{% link /assets/images/favicon/apple-touch-icon.png %}?v=2">
+<link rel="icon" type="image/png" sizes="32x32" href="{% link /assets/images/favicon/favicon-32x32.png %}?v=2">
+<link rel="icon" type="image/png" sizes="16x16" href="{% link /assets/images/favicon/favicon-16x16.png %}?v=2">
+<link rel="manifest" href="{% link assets/images/favicon/site.webmanifest %}?v=2">
+<link rel="mask-icon" href="{% link /assets/images/favicon/safari-pinned-tab.svg %}?v=2" color="#5bbad5">
+<link rel="shortcut icon" href="{% link /assets/images/favicon/favicon.ico %}?v=2">
+<meta name="msapplication-TileColor" content="#da532c">
+<meta name="msapplication-config" content="{% link assets/images/favicon/browserconfig.xml %}?v=2">
+<meta name="theme-color" content="#ffffff">

package.json

@@ -5,10 +5,11 @@
         "pregenerate-favicon": "mkdir -p assets/images/favicon",
         "generate-favicon": "real-favicon generate sources/favicon/faviconDescription.json sources/favicon/faviconData.json assets/images/favicon",
         "postgenerate-favicon": "for file in assets/images/favicon/browserconfig.xml assets/images/favicon/site.webmanifest; do perl -pi -e 'print \"---\\n---\\n\\n\" if $. == 1' \"$file\"; done",
-        "preinject-favicon": "mkdir -p _includes && touch _includes/custom-head.html",
-        "inject-favicon": "real-favicon inject sources/favicon/faviconData.json _includes _includes/custom-head.html",
-        "postinject-favicon": "for file in _includes/custom-head.html; do perl -pi -e 's/<\\/?(html|head|body)>\\n?//g' \"$file\"; done",
-        "linkify-favicon": "for file in assets/images/favicon/browserconfig.xml assets/images/favicon/site.webmanifest _includes/custom-head.html; do perl -pi -e 's/\\/assets\\/.+(?=\\?v=\\d+)/{% link $& %}/g' \"$file\"; done",
+        "preinject-favicon": "mkdir -p _includes && touch _includes/favicon.html",
+        "inject-favicon": "real-favicon inject sources/favicon/faviconData.json _includes _includes/favicon.html",
+        "postinject-favicon": "for file in _includes/favicon.html; do perl -pi -e 's/<\\/?(html|head|body)>\\n?//g' \"$file\"; done",
+        "linkify-favicon": "for file in assets/images/favicon/browserconfig.xml assets/images/favicon/site.webmanifest _includes/favicon.html; do perl -pi -e 's/\\/assets\\/.+(?=\\?v=\\d+)/{% link $& %}/g' \"$file\"; done",
+        "postlinkify-favicon": "for file in _includes/favicon.html; do perl -pi -e 's/\\/(?=assets\\/.+(site\\.webmanifest|browserconfig\\.xml))//g' \"$file\"; done",
         "update-favicon": "npm run generate-favicon && npm run inject-favicon && npm run linkify-favicon",
 
         "check-favicon-update": "real-favicon check-for-update --fail-on-update sources/favicon/faviconData.json"