From 9917d8023ec370caa1021937f0c7bb15d2371e49 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Thu, 21 Jul 2022 14:02:41 +0200
Subject: [PATCH] Edited README, fix backup run process

---
 README.rst                            | 7 ++++---
 modoboa_installer/scripts/__init__.py | 7 +------
 run.py                                | 5 ++++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst
index bc08e66..3313e76 100644
--- a/README.rst
+++ b/README.rst
@@ -100,12 +100,13 @@ An experimental backup mode is available.
 .. note::
 
    You must keep the original configuration file, ie the one used for
-   the installation. Otherwise, you will need to recreate it manually with the right informations !.
+   the installation. Otherwise, you will need to recreate it manually with the right informations !
 
 You can start the process as follows::
+
   $ sudo ./run.py --backup <your domain>
-.. note::
-  Then follow the step on the console
+
+ Then follow the step on the console
 
 Change the generated hostname
 -----------------------------
diff --git a/modoboa_installer/scripts/__init__.py b/modoboa_installer/scripts/__init__.py
index 8f526d5..3edfa66 100644
--- a/modoboa_installer/scripts/__init__.py
+++ b/modoboa_installer/scripts/__init__.py
@@ -6,16 +6,11 @@ import sys
 from .. import utils
 
 
-def install(appname, config, upgrade, backup):
+def install(appname, config, upgrade):
     """Install an application."""
     if (config.has_option(appname, "enabled") and
             not config.getboolean(appname, "enabled")):
         return
-    if backup:
-        utils.printcolor("Starting up backup...", utils.MAGENTA)
-        script = importlib.import_module("modoboa_installer.backup")
-        getattr(script, "BACKUP"())(config).run()
-        return
     utils.printcolor("Installing {}".format(appname), utils.MAGENTA)
     try:
         script = importlib.import_module(
diff --git a/run.py b/run.py
index 784d667..f09022d 100755
--- a/run.py
+++ b/run.py
@@ -15,7 +15,7 @@ from modoboa_installer import scripts
 from modoboa_installer import ssl
 from modoboa_installer import system
 from modoboa_installer import utils
-
+from modoboa_installer.scripts import backup
 
 def installation_disclaimer(args, config):
     """Display installation disclaimer."""
@@ -105,6 +105,9 @@ def main(input_args):
         upgrade_disclaimer(config)
     elif args.backup:
         backup_disclamer()
+        backupProcess = backup.Backup(config)
+        backupProcess.run()
+        return
     else:
         installation_disclaimer(args, config)