Change -V option to -v everywhere

scripts/kill.py

@@ -13,9 +13,8 @@ def main():
     def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
     parser = argparse.ArgumentParser(
         description = 'Kill/remove a process from the NilmRun server',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
-    parser.add_argument("-V", "--version", action="version",
+        version = nilmrun.__version__)
-                        version = nilmrun.__version__)
     group = parser.add_argument_group("Standard options")
     group.add_argument('-u', '--url',
                        help = 'NilmRun server URL', default = def_url)

scripts/nilmrun_server.py

@@ -10,10 +10,8 @@ def main():
 
     parser = argparse.ArgumentParser(
         description = 'Run the NilmRun server',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
-
+        version = nilmrun.__version__)
-    parser.add_argument("-V", "--version", action="version",
-                        version = nilmrun.__version__)
 
     group = parser.add_argument_group("Standard options")
     group.add_argument('-a', '--address',

scripts/ps.py

@@ -13,9 +13,8 @@ def main():
     def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
     parser = argparse.ArgumentParser(
         description = 'List NilmRun processes',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
-    parser.add_argument("-V", "--version", action="version",
+        version = nilmrun.__version__)
-                        version = nilmrun.__version__)
     group = parser.add_argument_group("Standard options")
     group.add_argument('-u', '--url',
                        help = 'NilmRun server URL', default = def_url)
@@ -40,13 +39,14 @@ def main():
            round(info['system']['mem_used'] * 100.0
                  / info['system']['mem_total']))
 
+    # Print process detail for each managed process
+    fmt = "%-36s %-6s %-15s %-4s %-3s %-5s\n"
+    printf(fmt, "PID", "STATE", "SINCE", "PROC", "CPU", "LOG")
+
     if len(info['pids']) == 0:
         printf("No running processes\n")
         raise SystemExit(0)
 
-    # Print process detail for each managed process
-    fmt = "%-36s %-6s %-15s %-4s %-3s %-5s\n"
-    printf(fmt, "PID", "STATE", "SINCE", "PROC", "CPU", "LOG")
     for pid in sorted(info['pids'].keys()):
         pidinfo = client.get("process/status", { "pid": pid })
         if pidinfo['alive']:

scripts/run.py

@@ -14,9 +14,8 @@ def main():
     def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
     parser = argparse.ArgumentParser(
         description = 'Run a command on the NilmRun server',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
-    parser.add_argument("-V", "--version", action="version",
+        version = nilmrun.__version__)
-                        version = nilmrun.__version__)
     group = parser.add_argument_group("Standard options")
     group.add_argument('-u', '--url',
                        help = 'NilmRun server URL', default = def_url)