Fix entrypoint installation

diff --git a/mkosi/__main__.py b/mkosi/__main__.py
index 0ba6a4785402bebfb1be1b766aac8f037d8ff6df..ae890608de5b740c48e6399b7c5b8363ad4f229b 100644 (file)
--- a/mkosi/__main__.py
+++ b/mkosi/__main__.py
@@ -6,18 +6,23 @@ import sys
 from . import parse_args, complete_step, run_verb, die, MkosiException
 
 
-try:
-    args = parse_args()
+def main() -> None:
+    try:
+        args = parse_args()
 
-    for job_name, a in args.items():
-        # Change working directory if --directory is passed
-        if a.directory:
-            work_dir = a.directory
-            if os.path.isdir(work_dir):
-                os.chdir(work_dir)
-            else:
-                die(f"Error: {work_dir} is not a directory!")
-        with complete_step(f"Processing {job_name}"):
-            run_verb(a)
-except MkosiException:
-    sys.exit(1)
+        for job_name, a in args.items():
+            # Change working directory if --directory is passed
+            if a.directory:
+                work_dir = a.directory
+                if os.path.isdir(work_dir):
+                    os.chdir(work_dir)
+                else:
+                    die(f"Error: {work_dir} is not a directory!")
+            with complete_step(f"Processing {job_name}"):
+                run_verb(a)
+    except MkosiException:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

diff --git a/setup.py b/setup.py
index 92038ad47bed7c9164103e68ff8aae2ede581595..6006e1fe499dfd5c639d0191d2870d4f896005af 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -28,5 +28,5 @@ setup(
     packages = ["mkosi"],
     cmdclass = { "man": BuildManpage },
     data_files = [('share/man/man1', ["man/mkosi.1"])],
-    entry_points = {"console_scripts": ["mkosi=mkosi.__main__"]},
+    entry_points = {"console_scripts": ["mkosi=mkosi.__main__:main"]},
 )