From e306c9ee8ab5a82e8a12a706aecf0d27a89c9372 Mon Sep 17 00:00:00 2001
From: "@xer0dayz" <1n3@hushmail.com>
Date: Wed, 1 Jul 2020 18:17:35 -0700
Subject: [PATCH] Merged several changes for v8.5

---
 CHANGELOG.md |  1 +
 install.sh   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4036801d..1830849e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## CHANGELOG:
+* v8.5 - Added Phantomjs manual installer
 * v8.5 - Added sc0pe template to check for default credentials via BruteX
 * v8.5 - Added fullportscans to all 'web' mode scans to ensure full port coverage
 * v8.5 - Fixed issue with 2nd stage OSINT scans not running
diff --git a/install.sh b/install.sh
index 8f345f8b..7e7ac07c 100755
--- a/install.sh
+++ b/install.sh
@@ -109,7 +109,7 @@ apt-get install -y xmlstarlet
 apt-get install -y net-tools
 apt-get install -y p7zip-full
 apt-get install -y jsbeautifier
-apt-get install -y phantomjs
+apt-get install -y phantomjs 2> /dev/null
 apt-get install -y metasploit-framework 2> /dev/null
 
 pip3 install dnspython colorama tldextract urllib3 ipaddress requests
@@ -237,6 +237,14 @@ cp -Rf * /usr/share/arachni/ 2> /dev/null
 cd /usr/share/arachni/bin/
 for a in `ls`; do ln -fs $PWD/$a /usr/bin/$a; done;
 
+# PHANTOMJS MANUAL INSTALL
+cd /usr/local/share
+wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 2> /dev/null
+tar xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 2> /dev/null
+ln -s /usr/local/share/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/share/phantomjs 2> /dev/null
+ln -s /usr/local/share/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs 2> /dev/null
+ln -s /usr/local/share/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/bin/phantomjs 2> /dev/null
+
 echo -e "$OKBLUE[*]$RESET Setting up environment...$RESET"
 cd $PLUGINS_DIR/BlackWidow/ && bash install.sh force 2> /dev/null
 cd $PLUGINS_DIR/BruteX/ && bash install.sh 2> /dev/null