From f4e7789a8de3b4a67dd5826348b75a8662da6783 Mon Sep 17 00:00:00 2001
From: DaAwesomeP <DaAwesomeP@users.noreply.github.com>
Date: Wed, 17 Aug 2016 19:34:02 -0500
Subject: [PATCH] fix imagemin, use imagemin for SVGs, compress converted icons

---
 bin/wappalyzer-build     | 10 +++-------
 docker/node/package.json |  5 ++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 382c91f29..24e0f788c 100755
--- a/bin/wappalyzer-build
+++ b/bin/wappalyzer-build
@@ -22,13 +22,9 @@ echo "Prettifying apps.json..."
 
 node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZER_ROOT/src/apps.json
 
-echo "Compressing PNG icons..."
+echo "Compressing PNG and SVG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 7
-
-echo "Compressing SVG icons..."
-
-node $WAPPALYZER_NODE_PATH/node_modules/svgo/bin/svgo -q -f $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* $WAPPALYZER_ROOT/src/icons
 
 echo "Converting SVG icons to PNG..."
 
@@ -50,7 +46,7 @@ IFS="$OIFS"
 
 echo "Compressing converted PNG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/converted $WAPPALYZER_ROOT/src/icons/converted -o 7
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/converted/* $WAPPALYZER_ROOT/src/icons/converted
 
 wappalyzer links
 
diff --git a/docker/node/package.json b/docker/node/package.json
index 30f0c9552..cbfe4c39e 100644
--- a/docker/node/package.json
+++ b/docker/node/package.json
@@ -17,10 +17,9 @@
     "read-chunk": "2.0.*",
     "jsonlint": "*",
     "jpm": "*",
-    "imagemin-cli": "*",
+    "imagemin-cli": "2.*.*",
     "phantomjs-prebuilt": "*",
-    "svg2png": "*",
-    "svgo": "*"
+    "svg2png": "3.*.*"
   },
   "engines": {
     "node": ">= 4"