add return codes

openwebrx.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
+import sys
 from owrx.__main__ import main
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())

owrx/__main__.py

@@ -57,12 +57,15 @@ def main():
 
     if args.version:
         print("OpenWebRX version {version}".format(version=openwebrx_version))
-    elif args.module == "admin":
+        return 0
-        run_admin_action(adminparser, args)
+
-    elif args.module == "config":
+    if args.module == "admin":
-        run_admin_action(configparser, args)
+        return run_admin_action(adminparser, args)
-    else:
+
-        start_receiver()
+    if args.module == "config":
+        return run_admin_action(configparser, args)
+
+    return start_receiver()
 
 
 def start_receiver():
@@ -100,7 +103,7 @@ Support and info:       https://groups.io/g/openwebrx
             description = featureDetector.get_requirement_description(f)
             if description:
                 logger.error("description for %s:\n%s", f, description)
-        return
+        return 1
 
     # Get error messages about unknown / unavailable features as soon as possible
     # start up "always-on" sources right away
@@ -119,3 +122,5 @@ Support and info:       https://groups.io/g/openwebrx
     SdrService.stopAllSources()
     ReportingEngine.stopAll()
     DecoderQueue.stopAll()
+
+    return 0

owrx/admin/__init__.py

@@ -46,15 +46,14 @@ def run_admin_action(parser, args):
     else:
         if not hasattr(args, "silent") or not args.silent:
             parser.print_help()
-            sys.exit(1)
+            return 1
-        sys.exit(0)
+        return 0
 
     try:
-        command.run(args)
+        return command.run(args)
     except Exception:
         if not hasattr(args, "silent") or not args.silent:
             print("Error running command:")
             traceback.print_exc()
-            sys.exit(1)
+            return 1
-        sys.exit(0)
+        return 0
-

owrx/admin/commands.py

@@ -30,8 +30,7 @@ class UserCommand(Command, metaclass=ABCMeta):
             password = getpass("Please enter the new password for {username}: ".format(username=username))
             confirm = getpass("Please confirm the new password: ")
             if password != confirm:
-                print("ERROR: Password mismatch.")
+                raise ValueError("Password mismatch")
-                sys.exit(1)
             generated = False
         return password, generated
 
@@ -108,8 +107,9 @@ class HasUser(Command):
         if args.user in userList:
             if not args.silent:
                 print('User "{name}" exists.'.format(name=args.user))
+            return 0
         else:
             if not args.silent:
                 print('User "{name}" does not exist.'.format(name=args.user))
             # in bash, a return code > 0 is interpreted as "false"
-            sys.exit(1)
+            return 1