Whoops

README.md

@@ -16,6 +16,7 @@ TODO
 * Write manpages
 * Add `install` and `uninstall` makefile targets
 * `sshwot-scan-known-hosts`
+* Investigate why it says sshwot-file is required in `sshwot-filter`
 
 License
 -------

src/main-filter.py

@@ -101,7 +101,7 @@ def main():
 
 	# Use the default files if no input files were specified
 	if len(args.infiles) == 0:
-		infiles = open_default_files.open_all()
+		infiles = default_files.open_all()
 	else:
 		infiles = args.infiles
 

src/main-verify.py

@@ -74,6 +74,9 @@ def main():
 	else:
 		infiles = args.infiles
 
+	# Only do colour if we are outputting to a tty
+	colour = os.isatty(sys.stdout.fileno())
+
 	# Check
 	any_verified = False
 	for path in infiles:
@@ -94,11 +97,17 @@ def main():
 			# Use for display the same normalzed format as internally
 			# We do .decode() here, as it produces bytes
 			host_display = entry.normalize_host(match_host, match_port).decode()
-			print('[\x1b[32mok\x1b[0m] %s: %s: %s' % (name, host_display, match_comment))
+			if colour:
+				print('[\x1b[32mok\x1b[0m] %s: %s: %s' % (name, host_display, match_comment))
+			else:
+				print('[ok] %s: %s: %s' % (name, host_display, match_comment))
 
 		for fail_host, fail_port, fail_comment in fail:
 			host_display = entry.normalize_host(fail_host, fail_port).decode()
-			print('[\x1b[31mfail\x1b[0m] %s: %s: %s' % (name, host_display, fail_comment))
+			if colour:
+				print('[\x1b[31mfail\x1b[0m] %s: %s: %s' % (name, host_display, fail_comment))
+			else:
+				print('[fail] %s: %s: %s' % (name, host_display, fail_comment))
 
 		# Only display this if we didn't get a match in this file
 		# The value in the [same fingerprint] message is finding a host