Merge pull request #119 from zachriggle/cyclic-newline-fix

Cyclic should only emit a newline when writing to a TTY
Gallopsled · Sep 17, 2014 · e37b606 · e37b606
2 parents 1183fe4 + 6ff0fe8
commit e37b606
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/bin/cyclic b/bin/cyclic
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-import argparse, string
+import argparse, string, sys
 from pwnlib.util import cyclic, packing
 from pwnlib import log
 
@@ -67,4 +67,8 @@ else:
     got    = len(result)
     if got < want:
         log.failure("Alphabet too small (max length = %i)" % got)
-    print result
+
+    sys.stdout.write(result)
+
+    if sys.stdout.isatty():
+        sys.stdout.write('\n')