Introduce ctrl+c and other bug fixes (#1152)

* Intergrate ctrl+c

* stash

* Update

* Fix profile reset

* flake8

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

1 files changed, 13 insertions, 4 deletions

diff --git a/profiles/server.py b/profiles/server.py
index 91ac7cf2..21681c2f 100644
--- a/profiles/server.py
+++ b/profiles/server.py
@@ -1,8 +1,14 @@
 # Used to select various server application profiles on top of a minimal installation.
 
 import logging
+from typing import Any, TYPE_CHECKING
 
 import archinstall
+from archinstall import Menu
+from archinstall.lib.menu.menu import MenuSelectionType
+
+if TYPE_CHECKING:
+	_: Any
 
 is_top_level_profile = True
 
@@ -26,15 +32,18 @@ def _prep_function(*args, **kwargs):
 	Magic function called by the importing installer
 	before continuing any further.
 	"""
-	servers = archinstall.Menu(str(_(
+	choice = Menu(str(_(
 		'Choose which servers to install, if none then a minimal installation wil be done')),
 		available_servers,
-		preset_values=archinstall.storage.get('_selected_servers', []),
+		preset_values=kwargs['servers'],
 		multi=True
 	).run()
 
-	if servers:
-		archinstall.storage['_selected_servers'] = servers
+	if choice.type_ != MenuSelectionType.Selection:
+		return False
+
+	if choice.value:
+		archinstall.storage['_selected_servers'] = choice.value
 		return True
 
 	return False