benchmark-cmd --cleanup-once now runs cleanups at the end

Also, a bit clearer code.

1 files changed, 8 insertions, 5 deletions

diff --git a/benchmark-cmd b/benchmark-cmd
index d904602..0a50654 100755
--- a/benchmark-cmd
+++ b/benchmark-cmd
@@ -92,18 +92,21 @@ class Benchmarker(cliapp.Application):
         results.add_column('elapsed', '(s)', '%.1f')
         results.add_column('cmd', '', '%-0s', left=True)
 
-        first = True
-        for cmd in self.settings['command']:
-            if first or not self.settings['setup-once']:
+        commands = self.settings['command']
+        if commands and self.settings['setup-once']:
+            self.setup()
+        for cmd in commands:
+            if not self.settings['setup-once']:
                 self.setup()
             numbers = self.measure_cmd(cmd)
             self.verify()
             results.add_row(numbers + (cmd,))
-            if first or not self.settings['cleanup-once']:
+            if not self.settings['cleanup-once']:
                 self.cleanup()
             if self.settings['verbose']:
                 self.output.write('\n')
-            first = False
+        if commands and self.settings['cleanup-once']:
+            self.cleanup()
 
         results.write_plaintext(self.output)