diff --git a/Wifite.py b/Wifite.py index 065f72e..a88f64e 100755 --- a/Wifite.py +++ b/Wifite.py @@ -185,6 +185,6 @@ if __name__ == '__main__': Color.pl(err) Color.pl('\n{!} {R}Exiting{W}\n') except KeyboardInterrupt: - Color.pl('\n{!} {O}interrupted{W}') + Color.pl('\n{!} {O}interrupted, shutting down...{W}') Configuration.exit_gracefully(0) diff --git a/py/Airmon.py b/py/Airmon.py index 01cb7a4..f31e49f 100644 --- a/py/Airmon.py +++ b/py/Airmon.py @@ -113,7 +113,7 @@ class Airmon(object): @staticmethod def stop(iface): - Color.p("{+} {R}disabling {O}monitor mode{R} on {O}%s{W}... " % iface) + Color.p("{!} {R}disabling {O}monitor mode{O} on {R}%s{O}... " % iface) (out,err) = Process.call('airmon-ng stop %s' % iface) mon_iface = None for line in out.split('\n'): @@ -133,7 +133,7 @@ class Airmon(object): break if mon_iface: - Color.pl('{R}disabled {O}%s{W}' % mon_iface) + Color.pl('{R}disabled %s{W}' % mon_iface) else: Color.pl('{O}could not disable on {R}%s{W}' % iface) @@ -252,15 +252,16 @@ class Airmon(object): @staticmethod def put_interfaces_up(): - Color.pl("{+} {O}Putting interfaces up...") for interface in Airmon.get_interfaces(): - Color.pl("{+} {B}up into {O}%s" %(interface.name)) + Color.p("{!} {O}putting interface {R}%s up{O}..." %(interface.name)) (out,err) = Process.call('ifconfig %s up' %(interface.name)) + Color.pl(" {R}done{W}") @staticmethod def start_network_manager(): - Color.pl("{+} {O}Starting NetworkManager") + Color.p("{!} {O}Restarting {R}NetworkManager{O}...") (out,err) = Process.call('systemctl start NetworkManager') + Color.pl(" {R}restarted{W}") if __name__ == '__main__': Airmon.terminate_conflicting_processes() diff --git a/py/Configuration.py b/py/Configuration.py index 7ded288..b376885 100644 --- a/py/Configuration.py +++ b/py/Configuration.py @@ -289,9 +289,10 @@ class Configuration(object): Configuration.delete_temp() Macchanger.reset_if_changed() from Airmon import Airmon - Airmon.stop(Configuration.interface) - Airmon.put_interfaces_up() - Airmon.start_network_manager() + if Configuration.interface is not None: + Airmon.stop(Configuration.interface) + Airmon.put_interfaces_up() + Airmon.start_network_manager() exit(code) @staticmethod