From 7ebf0ef03c954b69f86d47a1fd1eae0d84599ec0 Mon Sep 17 00:00:00 2001
From: deltaxflux <deltax.fluxion@gmail.com>
Date: Tue, 18 Jul 2017 13:06:21 +0200
Subject: [PATCH] Remove dependencies, since wps slaughter isn't used anymore

---
 .gitmodules             |   3 +
 README.md               |   4 +-
 install/arch-install.sh | 363 +++++++++++++++++++---------------------
 install/install.sh      | 349 +++++++++++++++++++-------------------
 sites                   |   1 +
 5 files changed, 350 insertions(+), 370 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 sites

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d336d8f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sites"]
+	path = sites
+	url = https://github.com/FluxionNetwork/sites
diff --git a/README.md b/README.md
index 6feee25..4f14777 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,10 @@ In the experimental version it will automatically check the handshake. I will fi
 This is how the script works. The fake captive portal is set up by the script itself to collect the credentials. Don't freak, it's al okay.
 
 #### "The MAC address of the fake access point differs from the original"
-The MAC address of the fake access point differs by one octet from the original in order to prevent fluxion deauthenticating clients from itself during the session. 
+The MAC address of the fake access point differs by one octet from the original in order to prevent fluxion deauthenticating clients from itself during the session.
 
 ## Installation
-``` wget https://raw.githubusercontent.com/FluxionNetwork/fluxion/master/install/install.sh && bash install.sh ```
+``` git clone --recursive https://github.com/FluxionNetwork/fluxion.git```
 
 ## Updates
 If you want to submit a feature, do so by labeling your issue as an "enhancement" or submit a PR. I don't have enough time to make daily changes to fluxion, sorry.
diff --git a/install/arch-install.sh b/install/arch-install.sh
index e3cc53e..e969ee3 100755
--- a/install/arch-install.sh
+++ b/install/arch-install.sh
@@ -24,24 +24,24 @@ DUMP_PATH="/tmp/Installer/"
 
 function conditional_clear() {
 
-	if [[ "$INSTALLER_output_device" != "/dev/stdout" ]]; then clear; fi
+        if [[ "$INSTALLER_output_device" != "/dev/stdout" ]]; then clear; fi
 }
 
 #Config_END
 if [ $INSTALLER_DEBUG = 1 ]; then
-	## Developer Mode
-	export INSTALLER_output_device=/dev/stdout
-	HOLD="-hold"
+        ## Developer Mode
+        export INSTALLER_output_device=/dev/stdout
+        HOLD="-hold"
 else
-	## Normal Mode
-	export INSTALLER_output_device=/dev/null
-	HOLD=""
+        ## Normal Mode
+        export INSTALLER_output_device=/dev/null
+        HOLD=""
 fi
 
 #Check root
 if [[ $EUID -ne 0 ]]; then
         echo -e "\e[1;31mYou don't have admin privilegies, execute the script as root."$transparent
-				exit
+                                exit
 fi
 
 clear
@@ -53,74 +53,72 @@ if [ -z "${DISPLAY:-}" ]; then
     exit 1
 fi
 
-
-
 function mostrarheader(){
 
-	conditional_clear
-	echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]"
-	echo -e "$red[                                                      ]"
+        conditional_clear
+        echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]"
+        echo -e "$red[                                                      ]"
     echo -e "$red[  $red    FLUXION $version" "${yellow} ${red}  < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture >     "          ${blue}" ]"
-	echo -e "$blue[                                                      ]"
-	echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent"
-	echo
-	echo
+        echo -e "$blue[                                                      ]"
+        echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent"
+        echo
+        echo
 
 }
 
 function setresolution {
 
-	function resA {
+        function resA {
 
-		TOPLEFT="-geometry 90x13+0+0"
-		TOPRIGHT="-geometry 83x26-0+0"
-		BOTTOMLEFT="-geometry 90x24+0-0"
-		BOTTOMRIGHT="-geometry 75x12-0-0"
-		TOPLEFTBIG="-geometry 91x42+0+0"
-		TOPRIGHTBIG="-geometry 83x26-0+0"
-	}
+                TOPLEFT="-geometry 90x13+0+0"
+                TOPRIGHT="-geometry 83x26-0+0"
+                BOTTOMLEFT="-geometry 90x24+0-0"
+                BOTTOMRIGHT="-geometry 75x12-0-0"
+                TOPLEFTBIG="-geometry 91x42+0+0"
+                TOPRIGHTBIG="-geometry 83x26-0+0"
+        }
 
-	function resB {
+        function resB {
 
-		TOPLEFT="-geometry 92x14+0+0"
-		TOPRIGHT="-geometry 68x25-0+0"
-		BOTTOMLEFT="-geometry 92x36+0-0"
-		BOTTOMRIGHT="-geometry 74x20-0-0"
-		TOPLEFTBIG="-geometry 100x52+0+0"
-		TOPRIGHTBIG="-geometry 74x30-0+0"
-	}
-	function resC {
+                TOPLEFT="-geometry 92x14+0+0"
+                TOPRIGHT="-geometry 68x25-0+0"
+                BOTTOMLEFT="-geometry 92x36+0-0"
+                BOTTOMRIGHT="-geometry 74x20-0-0"
+                TOPLEFTBIG="-geometry 100x52+0+0"
+                TOPRIGHTBIG="-geometry 74x30-0+0"
+        }
+        function resC {
 
-		TOPLEFT="-geometry 100x20+0+0"
-		TOPRIGHT="-geometry 109x20-0+0"
-		BOTTOMLEFT="-geometry 100x30+0-0"
-		BOTTOMRIGHT="-geometry 109x20-0-0"
-		TOPLEFTBIG="-geometry  100x52+0+0"
-		TOPRIGHTBIG="-geometry 109x30-0+0"
-	}
-	function resD {
-		TOPLEFT="-geometry 110x35+0+0"
-		TOPRIGHT="-geometry 99x40-0+0"
-		BOTTOMLEFT="-geometry 110x35+0-0"
-		BOTTOMRIGHT="-geometry 99x30-0-0"
-		TOPLEFTBIG="-geometry 110x72+0+0"
-		TOPRIGHTBIG="-geometry 99x40-0+0"
-	}
-	function resE {
-		TOPLEFT="-geometry 130x43+0+0"
-		TOPRIGHT="-geometry 68x25-0+0"
-		BOTTOMLEFT="-geometry 130x40+0-0"
-		BOTTOMRIGHT="-geometry 132x35-0-0"
-		TOPLEFTBIG="-geometry 130x85+0+0"
-		TOPRIGHTBIG="-geometry 132x48-0+0"
-	}
-	function resF {
-		TOPLEFT="-geometry 100x17+0+0"
-		TOPRIGHT="-geometry 90x27-0+0"
-		BOTTOMLEFT="-geometry 100x30+0-0"
-		BOTTOMRIGHT="-geometry 90x20-0-0"
-		TOPLEFTBIG="-geometry  100x70+0+0"
-		TOPRIGHTBIG="-geometry 90x27-0+0"
+                TOPLEFT="-geometry 100x20+0+0"
+                TOPRIGHT="-geometry 109x20-0+0"
+                BOTTOMLEFT="-geometry 100x30+0-0"
+                BOTTOMRIGHT="-geometry 109x20-0-0"
+                TOPLEFTBIG="-geometry  100x52+0+0"
+                TOPRIGHTBIG="-geometry 109x30-0+0"
+        }
+        function resD {
+                TOPLEFT="-geometry 110x35+0+0"
+                TOPRIGHT="-geometry 99x40-0+0"
+                BOTTOMLEFT="-geometry 110x35+0-0"
+                BOTTOMRIGHT="-geometry 99x30-0-0"
+                TOPLEFTBIG="-geometry 110x72+0+0"
+                TOPRIGHTBIG="-geometry 99x40-0+0"
+        }
+        function resE {
+                TOPLEFT="-geometry 130x43+0+0"
+                TOPRIGHT="-geometry 68x25-0+0"
+                BOTTOMLEFT="-geometry 130x40+0-0"
+                BOTTOMRIGHT="-geometry 132x35-0-0"
+                TOPLEFTBIG="-geometry 130x85+0+0"
+                TOPRIGHTBIG="-geometry 132x48-0+0"
+        }
+        function resF {
+                TOPLEFT="-geometry 100x17+0+0"
+                TOPRIGHT="-geometry 90x27-0+0"
+                BOTTOMLEFT="-geometry 100x30+0-0"
+                BOTTOMRIGHT="-geometry 90x20-0-0"
+                TOPLEFTBIG="-geometry  100x70+0+0"
+                TOPRIGHTBIG="-geometry 90x27-0+0"
 }
 
 detectedresolution=$(xdpyinfo | grep -A 3 "screen #0" | grep dimensions | tr -s " " | cut -d" " -f 3)
@@ -130,14 +128,14 @@ detectedresolution=$(xdpyinfo | grep -A 3 "screen #0" | grep dimensions | tr -s
 ##  D) 1280x1024
 ##  E) 1600x1200
 case $detectedresolution in
-	"1024x600" ) resA ;;
-	"1024x768" ) resB ;;
-	"1280x768" ) resC ;;
-	"1366x768" ) resC ;;
-	"1280x1024" ) resD ;;
-	"1600x1200" ) resE ;;
-	"1366x768"  ) resF ;;
-		  * ) resA ;;
+        "1024x600" ) resA ;;
+        "1024x768" ) resB ;;
+        "1280x768" ) resC ;;
+        "1366x768" ) resC ;;
+        "1280x1024" ) resD ;;
+        "1600x1200" ) resE ;;
+        "1366x768"  ) resF ;;
+                  * ) resA ;;
 esac
 }
 
@@ -152,173 +150,164 @@ sudo pacman -S xterm --noconfirm
 ##############################
 
 echo -ne "Aircrack-ng....."
-	if ! hash aircrack-ng 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent
-	 xterm $HOLD -title "Installing Aircrack-ng" -e pacman -S  aircrack-ng
-	else
+        if ! hash aircrack-ng 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent
+         xterm $HOLD -title "Installing Aircrack-ng" -e pacman -S  aircrack-ng
+        else
     echo -e "\e[1;32mOK!"$transparent
-	fi
-	sleep 0.025
+        fi
+        sleep 0.025
 
 ##############################
 
 echo -ne "Aireplay-ng....."
-	if ! hash awk 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Awk" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  gawk
-	else
-		echo -e "\e[1;32mOK!"$transparent
-	fi
-	sleep 0.025
+        if ! hash awk 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Awk" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  gawk
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Airodump-ng....."
 if ! hash airodump-ng 2>/dev/null; then
-	echo -e "\e[1;31mInstalling ..."$transparent""
-	xterm $HOLD -title "Installing Airodump-ng" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  aircrack-ng
+        echo -e "\e[1;31mInstalling ..."$transparent""
+        xterm $HOLD -title "Installing Airodump-ng" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  aircrack-ng
 else
-	echo -e "\e[1;32mOK!"$transparent""
-fi
-##############################
-	echo -ne "Bully..........."
-	if ! hash bully 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		cd /tmp;sudo git clone https://aur.archlinux.org/bully.git 2>/dev/null;	cd bully; sudo makepkg; sudo pacman -U *.pkg.tar.xz
-		xterm $HOLD -title "Installing Bully" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  bully
-	else
-		echo -e "\e[1;32mOK!"$transparent""
-	fi
-	sleep 0.025
+        echo -e "\e[1;32mOK!"$transparent""
+    fi
+
 ##############################
 echo -ne "Curl............"
-	if ! hash curl 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Curl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  curl
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash curl 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Curl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  curl
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Dhcpd..........."
-	if ! hash dhcpd 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing isc-dhcp-server" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S dhcp
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  	fi
-	sleep 0.025
+        if ! hash dhcpd 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing isc-dhcp-server" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S dhcp
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Hostapd........."
-	if ! hash hostapd 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Hostapd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  hostapd
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  	fi
-	sleep 0.025
+        if ! hash hostapd 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Hostapd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  hostapd
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Iwconfig........"
 if ! hash iwconfig 2>/dev/null; then
-			echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Iwconfig" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  iwconfig
+                        echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Iwconfig" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  iwconfig
 else
-	echo -e "\e[1;32mOK!"$transparent""
+        echo -e "\e[1;32mOK!"$transparent""
 fi
 sleep 0.025
 ##############################
-	echo -ne "Lighttpd........"
-	if ! hash lighttpd 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Lighttpd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  lighttpd
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  	fi
-	sleep 0.025
+        echo -ne "Lighttpd........"
+        if ! hash lighttpd 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Lighttpd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  lighttpd
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Macchanger......"
-	if ! hash macchanger 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  macchanger
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash macchanger 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  macchanger
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Mdk3............"
-	if ! hash mdk3 2>/dev/null; then
-	echo -e "\e[1;31mInstalling ..."$transparent""
-	xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  mdk3
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash mdk3 2>/dev/null; then
+        echo -e "\e[1;31mInstalling ..."$transparent""
+        xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  mdk3
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 
 ##############################
 
 echo -ne "Nmap............"
-	if ! hash nmap 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Nmap" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S nmap
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash nmap 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Nmap" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S nmap
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 echo -ne "Openssl........."
 if ! hash openssl 2>/dev/null; then
-	echo -e "\e[1;31mInstalling ..."$transparent""
-	xterm $HOLD -title "Installing Openssl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  openssl
+        echo -e "\e[1;31mInstalling ..."$transparent""
+        xterm $HOLD -title "Installing Openssl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  openssl
 else
-	echo -e "\e[1;32mOK!"$transparent""
+        echo -e "\e[1;32mOK!"$transparent""
 fi
 sleep 0.025
 ##############################
 echo -ne "Php-cgi........"
-	if ! hash php-cgi 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  php-cgi
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash php-cgi 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  php-cgi
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
-	echo -ne "Pyrit..........."
-	if ! hash pyrit 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  pyrit
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        echo -ne "Pyrit..........."
+        if ! hash pyrit 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  pyrit
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Python.........."
-	if ! hash python 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  python
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash python 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  python
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 
 ##############################
-	echo -ne "Reaver.........."
-	if ! hash reaver 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Reaver" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  reaver
-	else
-		echo -e "\e[1;32mOK!"$transparent""
-	fi
-	sleep 0.025
+        echo -ne "Reaver.........."
+        if ! hash reaver 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Reaver" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  reaver
+        else
+                echo -e "\e[1;32mOK!"$transparent""
+        fi
+        sleep 0.025
 ##############################
 
-	echo -ne "rfkill.........."
+        echo -ne "rfkill.........."
         if ! hash rfkill 2>/dev/null; then
               echo -e "\e[1;31mInstalling ..."$transparent""
               xterm $HOLD -title "Installing Rfkill" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  rfkill
@@ -330,13 +319,13 @@ echo -ne "Python.........."
 ##############################
 
 echo -ne "Unzip..........."
-	if ! hash unzip 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing unzip" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  unzip
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash unzip 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing unzip" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  unzip
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "strings.........."
@@ -357,9 +346,5 @@ else
 fi
 sleep 0.025
 #############################
-
 xterm $HOLD -title "Remove repositories"  -e python remove.py
 
-git clone https://github.com/molovo/revolver revolver
-chmod u+x revolver/revolver
-mv revolver/revolver /usr/local/bin
diff --git a/install/install.sh b/install/install.sh
index 5e5380e..41f162c 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -25,24 +25,24 @@ DUMP_PATH="/tmp/Installer/"
 
 function conditional_clear() {
 
-	if [[ "$INSTALLER_output_device" != "/dev/stdout" ]]; then clear; fi
+        if [[ "$INSTALLER_output_device" != "/dev/stdout" ]]; then clear; fi
 }
 
 #Config_END
 if [ $INSTALLER_DEBUG = 1 ]; then
-	## Developer Mode
-	export INSTALLER_output_device=/dev/stdout
-	HOLD="-hold"
+        ## Developer Mode
+        export INSTALLER_output_device=/dev/stdout
+        HOLD="-hold"
 else
-	## Normal Mode
-	export INSTALLER_output_device=/dev/null
-	HOLD=""
+        ## Normal Mode
+        export INSTALLER_output_device=/dev/null
+        HOLD=""
 fi
 
 #Check root
 if [[ $EUID -ne 0 ]]; then
         echo -e "\e[1;31mYou don't have admin privilegies, execute the script as root."$transparent
-				exit
+                                exit
 fi
 
 clear
@@ -58,70 +58,70 @@ fi
 
 function mostrarheader(){
 
-	conditional_clear
-	echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]"
-	echo -e "$red[                                                      ]"
-	echo -e "$red[  $red    FLUXION $version" "${yellow} ${red}  < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture >     "          ${blue}" ]"
-	echo -e "$blue[                                                      ]"
-	echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent"
-	echo
-	echo
+        conditional_clear
+        echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]"
+        echo -e "$red[                                                      ]"
+        echo -e "$red[  $red    FLUXION $version" "${yellow} ${red}  < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture >     "          ${blue}" ]"
+        echo -e "$blue[                                                      ]"
+        echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent"
+        echo
+        echo
 
 }
 
 function setresolution {
 
-	function resA {
+        function resA {
 
-		TOPLEFT="-geometry 90x13+0+0"
-		TOPRIGHT="-geometry 83x26-0+0"
-		BOTTOMLEFT="-geometry 90x24+0-0"
-		BOTTOMRIGHT="-geometry 75x12-0-0"
-		TOPLEFTBIG="-geometry 91x42+0+0"
-		TOPRIGHTBIG="-geometry 83x26-0+0"
-	}
+                TOPLEFT="-geometry 90x13+0+0"
+                TOPRIGHT="-geometry 83x26-0+0"
+                BOTTOMLEFT="-geometry 90x24+0-0"
+                BOTTOMRIGHT="-geometry 75x12-0-0"
+                TOPLEFTBIG="-geometry 91x42+0+0"
+                TOPRIGHTBIG="-geometry 83x26-0+0"
+        }
 
-	function resB {
+        function resB {
 
-		TOPLEFT="-geometry 92x14+0+0"
-		TOPRIGHT="-geometry 68x25-0+0"
-		BOTTOMLEFT="-geometry 92x36+0-0"
-		BOTTOMRIGHT="-geometry 74x20-0-0"
-		TOPLEFTBIG="-geometry 100x52+0+0"
-		TOPRIGHTBIG="-geometry 74x30-0+0"
-	}
-	function resC {
+                TOPLEFT="-geometry 92x14+0+0"
+                TOPRIGHT="-geometry 68x25-0+0"
+                BOTTOMLEFT="-geometry 92x36+0-0"
+                BOTTOMRIGHT="-geometry 74x20-0-0"
+                TOPLEFTBIG="-geometry 100x52+0+0"
+                TOPRIGHTBIG="-geometry 74x30-0+0"
+        }
+        function resC {
 
-		TOPLEFT="-geometry 100x20+0+0"
-		TOPRIGHT="-geometry 109x20-0+0"
-		BOTTOMLEFT="-geometry 100x30+0-0"
-		BOTTOMRIGHT="-geometry 109x20-0-0"
-		TOPLEFTBIG="-geometry  100x52+0+0"
-		TOPRIGHTBIG="-geometry 109x30-0+0"
-	}
-	function resD {
-		TOPLEFT="-geometry 110x35+0+0"
-		TOPRIGHT="-geometry 99x40-0+0"
-		BOTTOMLEFT="-geometry 110x35+0-0"
-		BOTTOMRIGHT="-geometry 99x30-0-0"
-		TOPLEFTBIG="-geometry 110x72+0+0"
-		TOPRIGHTBIG="-geometry 99x40-0+0"
-	}
-	function resE {
-		TOPLEFT="-geometry 130x43+0+0"
-		TOPRIGHT="-geometry 68x25-0+0"
-		BOTTOMLEFT="-geometry 130x40+0-0"
-		BOTTOMRIGHT="-geometry 132x35-0-0"
-		TOPLEFTBIG="-geometry 130x85+0+0"
-		TOPRIGHTBIG="-geometry 132x48-0+0"
-	}
-	function resF {
-		TOPLEFT="-geometry 100x17+0+0"
-		TOPRIGHT="-geometry 90x27-0+0"
-		BOTTOMLEFT="-geometry 100x30+0-0"
-		BOTTOMRIGHT="-geometry 90x20-0-0"
-		TOPLEFTBIG="-geometry  100x70+0+0"
-		TOPRIGHTBIG="-geometry 90x27-0+0"
+                TOPLEFT="-geometry 100x20+0+0"
+                TOPRIGHT="-geometry 109x20-0+0"
+                BOTTOMLEFT="-geometry 100x30+0-0"
+                BOTTOMRIGHT="-geometry 109x20-0-0"
+                TOPLEFTBIG="-geometry  100x52+0+0"
+                TOPRIGHTBIG="-geometry 109x30-0+0"
+        }
+        function resD {
+                TOPLEFT="-geometry 110x35+0+0"
+                TOPRIGHT="-geometry 99x40-0+0"
+                BOTTOMLEFT="-geometry 110x35+0-0"
+                BOTTOMRIGHT="-geometry 99x30-0-0"
+                TOPLEFTBIG="-geometry 110x72+0+0"
+                TOPRIGHTBIG="-geometry 99x40-0+0"
+        }
+        function resE {
+                TOPLEFT="-geometry 130x43+0+0"
+                TOPRIGHT="-geometry 68x25-0+0"
+                BOTTOMLEFT="-geometry 130x40+0-0"
+                BOTTOMRIGHT="-geometry 132x35-0-0"
+                TOPLEFTBIG="-geometry 130x85+0+0"
+                TOPRIGHTBIG="-geometry 132x48-0+0"
+        }
+        function resF {
+                TOPLEFT="-geometry 100x17+0+0"
+                TOPRIGHT="-geometry 90x27-0+0"
+                BOTTOMLEFT="-geometry 100x30+0-0"
+                BOTTOMRIGHT="-geometry 90x20-0-0"
+                TOPLEFTBIG="-geometry  100x70+0+0"
+                TOPRIGHTBIG="-geometry 90x27-0+0"
 }
 
 detectedresolution=$(xdpyinfo | grep -A 3 "screen #0" | grep dimensions | tr -s " " | cut -d" " -f 3)
@@ -131,14 +131,14 @@ detectedresolution=$(xdpyinfo | grep -A 3 "screen #0" | grep dimensions | tr -s
 ##  D) 1280x1024
 ##  E) 1600x1200
 case $detectedresolution in
-	"1024x600" ) resA ;;
-	"1024x768" ) resB ;;
-	"1280x768" ) resC ;;
-	"1366x768" ) resC ;;
-	"1280x1024" ) resD ;;
-	"1600x1200" ) resE ;;
-	"1366x768"  ) resF ;;
-		  * ) resA ;;
+        "1024x600" ) resA ;;
+        "1024x768" ) resB ;;
+        "1280x768" ) resC ;;
+        "1366x768" ) resC ;;
+        "1280x1024" ) resD ;;
+        "1600x1200" ) resE ;;
+        "1366x768"  ) resF ;;
+                  * ) resA ;;
 esac
 }
 
@@ -164,159 +164,150 @@ xterm $HOLD -title "Updating System"  $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e
 ##############################
 
 echo -ne "Aircrack-ng....."
-	if ! hash aircrack-ng 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent
-	 xterm $HOLD -title "Installing Aircrack-ng" -e apt-get --yes install aircrack-ng
-	else
+        if ! hash aircrack-ng 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent
+         xterm $HOLD -title "Installing Aircrack-ng" -e apt-get --yes install aircrack-ng
+        else
     echo -e "\e[1;32mOK!"$transparent
-	fi
-	sleep 0.025
+        fi
+        sleep 0.025
 
 ##############################
 
 echo -ne "Aireplay-ng....."
-	if ! hash awk 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Awk" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install gawk
-	else
-		echo -e "\e[1;32mOK!"$transparent
-	fi
-	sleep 0.025
+        if ! hash awk 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Awk" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install gawk
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Airodump-ng....."
 if ! hash airodump-ng 2>/dev/null; then
-	echo -e "\e[1;31mInstalling ..."$transparent""
-	xterm $HOLD -title "Installing Airodump-ng" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install aircrack-ng
+        echo -e "\e[1;31mInstalling ..."$transparent""
+        xterm $HOLD -title "Installing Airodump-ng" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install aircrack-ng
 else
-	echo -e "\e[1;32mOK!"$transparent""
+        echo -e "\e[1;32mOK!"$transparent""
 fi
-##############################
-	echo -ne "Bully..........."
-	if ! hash bully 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Bully" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install bully
-	else
-		echo -e "\e[1;32mOK!"$transparent""
-	fi
-	sleep 0.025
 ##############################
 echo -ne "Curl............"
-	if ! hash curl 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Curl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install curl
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash curl 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Curl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install curl
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Dhcpd..........."
-	if ! hash dhcpd 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing isc-dhcp-server" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install isc-dhcp-server
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  	fi
-	sleep 0.025
+        if ! hash dhcpd 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing isc-dhcp-server" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install isc-dhcp-server
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Hostapd........."
-	if ! hash hostapd 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Hostapd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install hostapd
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  	fi
-	sleep 0.025
+        if ! hash hostapd 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Hostapd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install hostapd
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Iwconfig........"
 if ! hash iwconfig 2>/dev/null; then
-			echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Iwconfig" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install iwconfig
+                        echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Iwconfig" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install iwconfig
 else
-	echo -e "\e[1;32mOK!"$transparent""
+        echo -e "\e[1;32mOK!"$transparent""
 fi
 sleep 0.025
 ##############################
-	echo -ne "Lighttpd........"
-	if ! hash lighttpd 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Lighttpd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install lighttpd
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  	fi
-	sleep 0.025
+        echo -ne "Lighttpd........"
+        if ! hash lighttpd 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Lighttpd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install lighttpd
+        else
+                echo -e "\e[1;32mOK!"$transparent
+        fi
+        sleep 0.025
 ##############################
 
 echo -ne "Macchanger......"
-	if ! hash macchanger 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install macchanger
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash macchanger 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install macchanger
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Mdk3............"
-	if ! hash mdk3 2>/dev/null; then
-	echo -e "\e[1;31mInstalling ..."$transparent""
-	xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install mdk3
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash mdk3 2>/dev/null; then
+        echo -e "\e[1;31mInstalling ..."$transparent""
+        xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install mdk3
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 
 ##############################
 
 echo -ne "Nmap............"
-	if ! hash nmap 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Nmap" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get install --yes nmap
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash nmap 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Nmap" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get install --yes nmap
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 echo -ne "Openssl........."
 if ! hash openssl 2>/dev/null; then
-	echo -e "\e[1;31mInstalling ..."$transparent""
-	xterm $HOLD -title "Installing Openssl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install openssl
+        echo -e "\e[1;31mInstalling ..."$transparent""
+        xterm $HOLD -title "Installing Openssl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install openssl
 else
-	echo -e "\e[1;32mOK!"$transparent""
+        echo -e "\e[1;32mOK!"$transparent""
 fi
 sleep 0.025
 ##############################
 echo -ne "Php-cgi........."
-	if ! hash php-cgi 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install php-cgi
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash php-cgi 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install php-cgi
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
-	echo -ne "Pyrit..........."
-	if ! hash pyrit 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install pyrit
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        echo -ne "Pyrit..........."
+        if ! hash pyrit 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install pyrit
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Python.........."
-	if ! hash python 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install python
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash python 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install python
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "rfkill.........."
@@ -331,23 +322,23 @@ echo -ne "rfkill.........."
 ##############################
 
 echo -ne "Unzip..........."
-	if ! hash unzip 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing unzip" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install unzip
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash unzip 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                        xterm $HOLD -title "Installing unzip" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install unzip
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 
 echo -ne "Xterm..........."
-	if ! hash xterm 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		apt-get install xterm
-	else
-		echo -e "\e[1;32mOK!"$transparent
+        if ! hash xterm 2>/dev/null; then
+                echo -e "\e[1;31mInstalling ..."$transparent""
+                apt-get install xterm
+        else
+                echo -e "\e[1;32mOK!"$transparent
   fi
-	sleep 0.025
+        sleep 0.025
 ##############################
 echo -ne "strings........."
 if ! hash strings 2>/dev/null; then
diff --git a/sites b/sites
new file mode 160000
index 0000000..ff349e7
--- /dev/null
+++ b/sites
@@ -0,0 +1 @@
+Subproject commit ff349e7e612fdad12b41afcc37d5a34229b4c267