diff --git a/arch-install b/arch-install index 2e2dc64..f98f1b4 100755 --- a/arch-install +++ b/arch-install @@ -57,12 +57,12 @@ fi function mostrarheader(){ - - echo -e "$blue#########################################################" - echo -e "$blue# #" - echo -e "$blue# $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" + 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 diff --git a/fluxion b/fluxion index 47afbee..5c8a577 100755 --- a/fluxion +++ b/fluxion @@ -36,8 +36,8 @@ HANDSHAKE_PATH="/root/handshakes" PASSLOG_PATH="/root/pwlog" WORK_DIR=`pwd` DEAUTHTIME="9999999999999" -revision=124 -version=0.24 +revision=125 +version=0.25 IP=192.168.1.1 RANG_IP=$(echo $IP | cut -d "." -f 1,2,3) @@ -602,15 +602,6 @@ function checkdependences { fi sleep 0.025 - echo -ne "bully..........." - if ! hash bully 2>/dev/null; then - echo -e "\e[1;31mNot installed"$transparent"" - exit=1 - 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;31mNot installed"$transparent"" @@ -711,15 +702,6 @@ function checkdependences { fi sleep 0.025 - echo -ne "reaver.........." - if ! hash reaver 2>/dev/null; then - echo -e "\e[1;31mNot installed"$transparent"" - exit=1 - else - echo -e "\e[1;32mOK!"$transparent"" - fi - sleep 0.025 - echo -ne "unzip..........." if ! hash unzip 2>/dev/null; then echo -e "\e[1;31mNot installed"$transparent"" diff --git a/install.sh b/install.sh index 65b68e9..6842ce7 100755 --- a/install.sh +++ b/install.sh @@ -10,7 +10,8 @@ fi #Config version=2 -revision=6 +revision=7 + #Colors red='\e[1;31m' blue='\e[1;34m' @@ -57,12 +58,12 @@ fi function mostrarheader(){ - - echo -e "$blue#########################################################" - echo -e "$blue# #" - echo -e "$blue# $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" + 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 @@ -298,7 +299,7 @@ echo -ne "Php-cgi........" sleep 0.025 ############################## - echo -ne "Pyrit..........." + 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 @@ -316,19 +317,9 @@ echo -ne "Python.........." 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 apt-get --yes install 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 apt-get --yes install rfkill