From 911d80374cbdbc77d8301b5b768ea9dbc825712f Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Mon, 25 Oct 2021 10:07:08 -0400
Subject: [PATCH] Created 4-pen-tools.sh

---
 1-setup.sh      |  3 ---
 3-post-setup.sh |  6 -----
 4-pen-tools.sh  | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
 README.md       |  1 +
 betterarch.sh   |  3 ++-
 5 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 4-pen-tools.sh

diff --git a/1-setup.sh b/1-setup.sh
index 5f575c4..b26994d 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -74,7 +74,6 @@ PKGS=(
 'automake' # build
 'base'
 'bash-completion'
-'bettercap' # Netorking swiss army knife
 'bind'
 'binutils'
 'bison'
@@ -136,12 +135,10 @@ PKGS=(
 'lzop'
 'm4'
 'make'
-'metasploit' #Exploit
 'milou'
 'nano'
 'neofetch'
 'networkmanager'
-'nmap' #Network scanning
 'ntfs-3g'
 'okular'
 'openbsd-netcat'
diff --git a/3-post-setup.sh b/3-post-setup.sh
index 4a741e5..2a72fa0 100644
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -10,7 +10,6 @@
 #▄████████  ▀█████▀ ▀████ ▀████ ▀█████▀████▄  ▄███▄   ▄████▄████▄   █████▀████  ████▄
 #
 #------------------------------------------------------------------------------------
-echo -e "\nFINAL SETUP AND CONFIGURATION"
 
 # ------------------------------------------------------------------------
 
@@ -56,8 +55,3 @@ sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 
 # Replace in the same state
 cd $pwd
-echo "
-###############################################################################
-# Done - Please Eject Install Media and Reboot
-###############################################################################
-"
diff --git a/4-pen-tools.sh b/4-pen-tools.sh
new file mode 100644
index 0000000..d35993d
--- /dev/null
+++ b/4-pen-tools.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#------------------------------------------------------------------------------------
+#                                                                          ▄▄
+#▀███▀▀▀██▄         ██    ██                        ██                    ███
+#  ██    ██         ██    ██                       ▄██▄                    ██
+#  ██    ██ ▄▄█▀██████████████  ▄▄█▀██▀███▄███    ▄█▀██▄   ▀███▄███ ▄██▀██ ███████▄
+#  ██▀▀▀█▄▄▄█▀   ██ ██    ██   ▄█▀   ██ ██▀ ▀▀   ▄█  ▀██     ██▀ ▀▀██▀  ██ ██    ██
+#  ██    ▀███▀▀▀▀▀▀ ██    ██   ██▀▀▀▀▀▀ ██       ████████    ██    ██      ██    ██
+#  ██    ▄███▄    ▄ ██    ██   ██▄    ▄ ██      █▀      ██   ██    ██▄    ▄██    ██
+#▄████████  ▀█████▀ ▀████ ▀████ ▀█████▀████▄  ▄███▄   ▄████▄████▄   █████▀████  ████▄
+#
+#------------------------------------------------------------------------------------
+
+echo -e "\nFINAL SETUP AND CONFIGURATION"
+
+echo -e "\nInstalling penetration testing tools"
+
+PKGS=(
+'airgeddon-git' # Audit wireless networks
+'ba-pentest-commons-meta'
+'bettercap' # Netorking swiss army knife
+'metasploit' # Exploit
+'nmap' # Network scanning
+'sherlock-git'
+)
+
+for PKG in "${PKGS[@]}"; do
+    echo "INSTALLING: ${PKG}"
+    sudo pacman -S "$PKG" --noconfirm --needed
+done
+
+cd ~/git
+echo -e "\nInstalling git repositories\n"
+git clone https://github.com/six2dez/reconftw.git
+cd reconftw/
+./install.sh
+
+cd ~/git
+git clone https://github.com/codingo/Reconnoitre.git
+python3 setup.py install
+
+cd ~/git
+git clone https://github.com/AlisamTechnology/ATSCAN
+chmod +x ./install.sh
+./install.sh
+
+cd ~/git
+git clone https://github.com/evyatarmeged/Raccoon.git
+cd Raccoon
+python setup.py install # Subsequent changes to the source code will not be reflected in calls to raccoon when this is used
+
+
+
+
+echo "
+###############################################################################
+# Done - Please Eject Install Media and Reboot
+###############################################################################
+"
\ No newline at end of file
diff --git a/README.md b/README.md
index 5cdff18..9b7da76 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ This README contains the steps I do to install and configure a fully-functional
 - Fail2ban
 - UFW
 - Portsmaster
+- Firejail sandboxing
 
 
 _Comes preinstalled with pentesting tools_
diff --git a/betterarch.sh b/betterarch.sh
index 39a36cc..78e7805 100644
--- a/betterarch.sh
+++ b/betterarch.sh
@@ -4,4 +4,5 @@
     arch-chroot /mnt /root/BetterArch/1-setup.sh
     source /mnt/root/BetterArch/install.conf
     arch-chroot /mnt /usr/bin/runuser -u $username -- /home/$username/BetterArch/2-user.sh
-    arch-chroot /mnt /root/BetterArch/3-post-setup.sh
\ No newline at end of file
+    arch-chroot /mnt /root/BetterArch/3-post-setup.sh
+    arch-chroot /mnt /root/BetterArch/4-pen-tools.sh
\ No newline at end of file