From 964bf2376321abd64dd2fa2cdece08e72f43c4f6 Mon Sep 17 00:00:00 2001 From: derv82 Date: Sat, 17 Mar 2018 15:07:58 -0400 Subject: [PATCH] Small fixes to verbose output --- Wifite.py | 2 ++ wifite/util/process.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Wifite.py b/Wifite.py index 39bacea..246013a 100755 --- a/Wifite.py +++ b/Wifite.py @@ -1,3 +1,5 @@ #!/usr/bin/python + from wifite import wifite + wifite.run() diff --git a/wifite/util/process.py b/wifite/util/process.py index 0b1af74..76c22cc 100755 --- a/wifite/util/process.py +++ b/wifite/util/process.py @@ -37,9 +37,9 @@ class Process(object): (stdout, stderr) = pid.communicate() if Configuration.verbose > 1 and stdout.strip() != '': - Color.pe("{P} [stdout] %s{W}" % '\n [stdout] '.join(stdout.split('\n'))) + Color.pe("{P} [stdout] %s{W}" % '\n [stdout] '.join(stdout.strip().split('\n'))) if Configuration.verbose > 1 and stderr.strip() != '': - Color.pe("{P} [stderr] %s{W}" % '\n [stderr] '.join(stderr.split('\n'))) + Color.pe("{P} [stderr] %s{W}" % '\n [stderr] '.join(stderr.strip().split('\n'))) return (stdout, stderr) @@ -92,14 +92,14 @@ class Process(object): ''' Waits for process to finish, returns stdout output ''' self.get_output() if Configuration.verbose > 1 and self.out.strip() != '': - Color.pe("{P} [stdout] %s{W}" % '\n [stdout] '.join(self.out.split('\n'))) + Color.pe("{P} [stdout] %s{W}" % '\n [stdout] '.join(self.out.strip().split('\n'))) return self.out def stderr(self): ''' Waits for process to finish, returns stderr output ''' self.get_output() if Configuration.verbose > 1 and self.err.strip() != '': - Color.pe("{P} [stderr] %s{W}" % '\n [stderr] '.join(self.err.split('\n'))) + Color.pe("{P} [stderr] %s{W}" % '\n [stderr] '.join(self.err.strip().split('\n'))) return self.err def stdoutln(self):