From: martin.holst@gmail.com <martin.holst@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Sat, 21 Sep 2013 20:46:32 +0000 (+0000)
Subject: Minor changes, usage examples and selftests
X-Git-Tag: v1.0.0~75
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/450d2e3a96aeff74dfd7bf42f6ab3870f8235c50

Minor changes, usage examples and selftests
---

diff --git a/client/scripts/14araw.lua b/client/scripts/14araw.lua
index f3434a16..0ce98656 100644
--- a/client/scripts/14araw.lua
+++ b/client/scripts/14araw.lua
@@ -2,7 +2,7 @@ local cmds = require('commands')
 local getopt = require('getopt')
 local lib14a = require('read14a')
 
-example = "script run writerraw -x 6000F57b"
+example = "script run 14araw -x 6000F57b"
 author = "Martin Holst Swende"
 
 
@@ -21,14 +21,14 @@ Arguments:
 Examples : 
 
 # 1. Connect and don't disconnect
-script run writeraw -p 
+script run 14araw -p 
 # 2. Send mf auth, read response (nonce)
-script run writeraw -o -x 6000F57b -p
+script run 14araw -o -x 6000F57b -p
 # 3. disconnect
-script run writeraw -o
+script run 14araw -o
 
 # All three steps in one go:
-script run writeraw -x 6000F57b
+script run 14araw -x 6000F57b
 ]]
 
 --[[
@@ -52,7 +52,7 @@ local DEBUG = false -- the debug flag
 -- A debug printout-function
 function dbg(args)
 	if DEBUG then
-		print("# ", args)
+		print("###", args)
 	end
 end 
 --- 
@@ -168,14 +168,18 @@ end
 -- 	Testing
 -------------------------
 function selftest()
+	DEBUG = true
+	dbg("Performing test")
+	main()
 	main("-p")
 	main(" -o -x 6000F57b -p")
 	main("-o")
 	main("-x 6000F57b")
+	dbg("Tests done")
 end
 -- Flip the switch here to perform a sanity check. 
 -- It read a nonce in two different ways, as specified in the usage-section
-if false then 
+if "--test"==args then 
 	selftest()
 else 
 	-- Call the main