Merge pull request #291 from rad4day/master

Improvementes to debugmode and update

fluxion

@@ -27,7 +27,7 @@ ipNmap=`ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*)
 # Deauth duration during handshake capture
 # oo
 DEAUTHTIME="9999999999999"
-revision=104
+revision=105
 version=0.23
 IP=192.168.1.1
 RANG_IP=$(echo $IP | cut -d "." -f 1,2,3)
@@ -125,6 +125,7 @@ trap exitmode SIGINT SIGHUP
 
 # KILL ALL
 function exitmode {
+    if [ "$FLUX_DEBUG" != "1" ]; then
         conditional_clear
         top
         echo -e "\n\n"$white"["$red"-"$white"] "$red"$general_exitmode"$transparent""
@@ -217,6 +218,7 @@ function exitmode {
         echo -e ""$white"["$green"+"$white"] "$grey"$general_exitmode_8"$transparent""
         sleep 2
         clear
+    fi
         exit
     
 }
@@ -772,7 +774,7 @@ fi
 
 if [ $FLUX_DEBUG != 1 ]; then
 	whiptail --title "Fluxion Disclaimer" --msgbox "Fluxion is intended to be used for legal security purposes only, and you should only use it to protect networks/hosts you own or have permission to test. Any other use is not the responsibility of the developer(s).  Be sure that you understand and are complying with the Fluxion licenses and laws in your area.  In other words, don't be stupid, don't be an asshole, and use this tool responsibly and legallys." 10 60
-	echo ""
+	clear; echo ""
 		   sleep 0.01 && echo -e "$red "
            sleep 0.01 && echo -e "         ⌠▓▒▓▒   ⌠▓╗     ⌠█┐ ┌█   ┌▓\  /▓┐   ⌠▓╖   ⌠◙▒▓▒◙   ⌠█\  ☒┐    "
            sleep 0.01 && echo -e "         ║▒_     │▒║     │▒║ ║▒    \▒\/▒/    │☢╫   │▒┌╤┐▒   ║▓▒\ ▓║    "
@@ -799,10 +801,12 @@ if [ $FLUX_DEBUG != 1 ]; then
 			if [ "$revision" != "$revision_online" ]; then
 				echo
 				echo
-				echo -e $red"	   New revision found!" $blue "->"$yellow" Update? [ENTER=skip]"
-				read doupdate
+				echo -ne $red"            New revision found! "$yellow
+                echo -ne "Update? [Y/n]: "$transparent
+				read -N1 doupdate
 				echo -ne "$transparent"
-				if [ "$doupdate" != "" ]; then
+                doupdate=${doupdate:-"Y"}
+				if [ "$doupdate" = "Y" ]; then
 					cp $0 $HOME/flux_rev-$revision.backup
 					curl "https://raw.githubusercontent.com/deltaxflux/fluxion/master/fluxion" -s -o $0
 					echo
@@ -812,6 +816,7 @@ if [ $FLUX_DEBUG != 1 ]; then
 					sleep 3
 					chmod +x $0
 					exec $0
+                    exit
 				fi
 			fi
 		fi