From 7a85b9962b19c53df109eecae04e54eb7c20bb52 Mon Sep 17 00:00:00 2001
From: Manuel <manuelalberto.gorrin@gmail.com>
Date: Wed, 16 Aug 2023 00:57:50 -0400
Subject: [PATCH 1/2] Fix packages missing and shellbang

---
 installer.sh | 79 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 23 deletions(-)

diff --git a/installer.sh b/installer.sh
index 9734b75..55195a5 100755
--- a/installer.sh
+++ b/installer.sh
@@ -1,4 +1,4 @@
-#!bin/bash
+#! /bin/bash
 
 #Colors
 white="\033[1;37m"
@@ -640,26 +640,59 @@ check_managedEn() {
 	fi
 }
 
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	Title
-	echo "Install Requirements"
-	echo
-	sudo apt-get install xterm -y
-	sudo apt-get install gnome-terminal -y
-	sudo apt-get install wireless-tools aircrack-ng -y
-	sudo apt install aircrack-ng -y
-	sudo apt install airgraph-ng -y
-	sudo apt install nmap -y
-	sudo apt-get install mdk4 -y
-	sudo apt install hping3 -y
-	sudo apt-get install bettercap -y
-	sudo apt-get install -y netdiscover -y
-	sudo apt install macchanger -y
-	sudo apt-get install john -y
-	sudo apt install iw -y
-	sudo apt-get install network-manager -y
-	sudo apt install enum4linux -y
-	sudo apt install nbtscan -y
-	sudo apt install crackmapexec -y
-	sudo pip install speedtest-cli
+function install() {
+	if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+		Title
+		echo "Install Requirements"
+		echo
+		# Check if pip is installed
+		if ! command -v pip &> /dev/null; then
+			echo "pip is not installed, installing python3-pip..."
+			sudo apt update && sudo apt install python3-pip -y
+			
+		fi
+		if ! pip show speedtest-cli &> /dev/null; then
+			echo "speedtest-cli is not installed, installing..."
+			sudo pip install speedtest-cli
+		else 
+			echo "speedtest-cli is installed"
+		fi
+
+		if sudo apt update && sudo apt install \
+		xterm \
+		gnome-terminal \
+		wireless-tools \
+		aircrack-ng \
+		airgraph-ng \
+		nmap \
+		mdk4 \
+		hping3 \
+		bettercap \
+		netdiscover \
+		macchanger \
+		john \
+		iw \
+		network-manager \
+		enum4linux \
+		nbtscan \
+		crackmapexec -y; then
+			return 0
+		else
+			return 1
+		fi
+	fi
+}
+
+#execute function install
+if install; then
+	echo "All package installed successfully."
+else 
+	echo "Error installing packages."
+	echo "Adding repository Kali Linux Tools"
+	echo '# Kali linux repositories | Added by NetRadar' | sudo tee -a /etc/apt/sources.list > /dev/null
+	echo 'deb https://http.kali.org/kali kali-rolling main contrib non-free' | sudo tee -a /etc/apt/sources.list > /dev/null
+	echo 'deb-src http://http.kali.org/kali kali-rolling main contrib non-free' | sudo tee -a /etc/apt/sources.list > /dev/null
+	echo "Adding key apt"
+	wget -q -O - archive.kali.org/archive-key.asc | sudo  apt-key add
+	install
 fi
\ No newline at end of file

From 1b2b6d624d1d260e1a8f1111a400cfbec714efa5 Mon Sep 17 00:00:00 2001
From: Kaelthas <39976595+kaelthasmanu@users.noreply.github.com>
Date: Wed, 16 Aug 2023 01:18:10 -0400
Subject: [PATCH 2/2] Update installer.sh

---
 installer.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer.sh b/installer.sh
index 55195a5..b4d1e93 100755
--- a/installer.sh
+++ b/installer.sh
@@ -676,9 +676,9 @@ function install() {
 		enum4linux \
 		nbtscan \
 		crackmapexec -y; then
-			return 0
-		else
 			return 1
+		else
+			return 0
 		fi
 	fi
 }
@@ -695,4 +695,4 @@ else
 	echo "Adding key apt"
 	wget -q -O - archive.kali.org/archive-key.asc | sudo  apt-key add
 	install
-fi
\ No newline at end of file
+fi