From e59aa11ecab0b97b2a364d09898982c7dfec52e6 Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Tue, 11 Jan 2022 21:16:34 +0100 Subject: [PATCH] fix installation --- pyquarantine/_install.py | 9 +++++---- pyquarantine/run.py | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pyquarantine/_install.py b/pyquarantine/_install.py index 4708d90..529e349 100644 --- a/pyquarantine/_install.py +++ b/pyquarantine/_install.py @@ -144,10 +144,10 @@ def install(name): if _check_openrc(): _install_files(_openrc_files(pkg_dir, name)) - if not _create_dir(f"/etc/{name}"): - logging.error(" => unable to create config dir, giving up ...") - sys.exit(3) - + for d in [f"/etc/{name}", f"/etc/{name}/templates"]: + if not _create_dir(d): + logging.error(" => unable to create config dir, giving up ...") + sys.exit(3) _install_files(_config_files(pkg_dir, name)) logging.info(f"{name} successfully installed") @@ -163,6 +163,7 @@ def uninstall(name): _uninstall_files(_openrc_files(pkg_dir, name)) _uninstall_files(_config_files(pkg_dir, name)) + _delete_dir(f"/etc/{name}/templates") _delete_dir(f"/etc/{name}") logging.info(f"{name} successfully uninstalled") diff --git a/pyquarantine/run.py b/pyquarantine/run.py index 6b61a5c..39e25ee 100644 --- a/pyquarantine/run.py +++ b/pyquarantine/run.py @@ -74,13 +74,6 @@ def main(): args = parser.parse_args() - name = "pyquarantine" - if args.install: - sys.exit(install(name)) - - if args.uninstall: - sys.exit(uninstall(name)) - root_logger = logging.getLogger() root_logger.setLevel(logging.DEBUG) @@ -95,6 +88,13 @@ def main(): if not args.debug: logger.setLevel(logging.INFO) + name = "pyquarantine" + if args.install: + sys.exit(install(name)) + + if args.uninstall: + sys.exit(uninstall(name)) + try: logger.debug("read milter configuration") cfg = get_milter_config(args.config)