From e546d2cb23f36385d379aee8efe29a72c4981b23 Mon Sep 17 00:00:00 2001 From: Spitap Date: Wed, 27 Jul 2022 16:32:59 +0200 Subject: [PATCH] Better UX --- modoboa_installer/scripts/__init__.py | 5 +---- modoboa_installer/scripts/dovecot.py | 2 +- modoboa_installer/scripts/postwhite.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modoboa_installer/scripts/__init__.py b/modoboa_installer/scripts/__init__.py index fa87c54..097b369 100644 --- a/modoboa_installer/scripts/__init__.py +++ b/modoboa_installer/scripts/__init__.py @@ -12,10 +12,7 @@ def install(appname, config, upgrade, restore): not config.getboolean(appname, "enabled")): return - if not restore: - utils.printcolor("Installing {}".format(appname), utils.MAGENTA) - else: - utils.printcolor("Restoring {}".format(appname), utils.MAGENTA) + utils.printcolor("Installing {}".format(appname), utils.MAGENTA) try: script = importlib.import_module( "modoboa_installer.scripts.{}".format(appname)) diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py index 77b6303..cb3e05a 100644 --- a/modoboa_installer/scripts/dovecot.py +++ b/modoboa_installer/scripts/dovecot.py @@ -89,7 +89,7 @@ class Dovecot(base.Installer): def post_run(self): """Additional tasks.""" if self.restore and len(os.listdir(self.restore + "mails")) > 0: - utils.printcolor("Copying mail backup over dovecot directory", utils.MAGENTA) + utils.printcolor("Copying mail backup over dovecot directory", utils.GREEN) if os.path.exists(self.home_dir): shutil.rmtree(self.home_dir) diff --git a/modoboa_installer/scripts/postwhite.py b/modoboa_installer/scripts/postwhite.py index c534205..26ab378 100644 --- a/modoboa_installer/scripts/postwhite.py +++ b/modoboa_installer/scripts/postwhite.py @@ -48,7 +48,7 @@ class Postwhite(base.Installer): POSTWHITE_REPOSITORY, install_dir) postwhiteBackupConf = self.restore+"custom/postwhite.conf" if self.restore and os.path.isfile(postwhiteBackupConf): - utils.printcolor("Restoring postwhite.conf backup.", utils.MAGENTA) + utils.printcolor("Restoring postwhite.conf backup.", utils.GREEN) utils.copy_file(postwhiteBackupConf, "/etc") else: utils.copy_file(os.path.join(postw_dir, "postwhite.conf"), "/etc")