From dd91f3ef3869213ba48eae6f219c260e9e9114e9 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Wed, 11 Jun 2025 20:27:42 +1000 Subject: [PATCH] Fix recursive call in scripts --- archinstall/scripts/guided.py | 6 +++++- archinstall/scripts/minimal.py | 6 +++++- archinstall/scripts/only_hd.py | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py index 51b1264fed..681b540235 100644 --- a/archinstall/scripts/guided.py +++ b/archinstall/scripts/guided.py @@ -182,10 +182,14 @@ def guided() -> None: exit(0) if not arch_config_handler.args.silent: + aborted = False with Tui(): if not config.confirm_config(): debug('Installation aborted') - guided() + aborted = True + + if aborted: + return guided() if arch_config_handler.config.disk_config: fs_handler = FilesystemHandler(arch_config_handler.config.disk_config) diff --git a/archinstall/scripts/minimal.py b/archinstall/scripts/minimal.py index 5c9b521475..1153f5be3c 100644 --- a/archinstall/scripts/minimal.py +++ b/archinstall/scripts/minimal.py @@ -71,10 +71,14 @@ def _minimal() -> None: exit(0) if not arch_config_handler.args.silent: + aborted = False with Tui(): if not config.confirm_config(): debug('Installation aborted') - _minimal() + aborted = True + + if aborted: + return _minimal() if arch_config_handler.config.disk_config: fs_handler = FilesystemHandler(arch_config_handler.config.disk_config) diff --git a/archinstall/scripts/only_hd.py b/archinstall/scripts/only_hd.py index f9a7b26bb6..b63ee94072 100644 --- a/archinstall/scripts/only_hd.py +++ b/archinstall/scripts/only_hd.py @@ -68,10 +68,14 @@ def _only_hd() -> None: exit(0) if not arch_config_handler.args.silent: + aborted = False with Tui(): if not config.confirm_config(): debug('Installation aborted') - _only_hd() + aborted = True + + if aborted: + return _only_hd() if arch_config_handler.config.disk_config: fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)