index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Daniel <blackrabbit256@gmail.com> | 2021-12-03 07:17:51 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-02 21:17:51 +0100 |
commit | 908c7b8cc0a804e9522d93fcf0dc71034c53ccdb (patch) | |
tree | 6ca53ef0354481512920997a5e48e51b36d591f6 /profiles | |
parent | 22ee2d90a1d2fb6af2ab5e80235e31f9da7a0550 (diff) |
-rw-r--r-- | profiles/desktop.py | 4 | ||||
-rw-r--r-- | profiles/i3.py | 3 | ||||
-rw-r--r-- | profiles/server.py | 8 |
diff --git a/profiles/desktop.py b/profiles/desktop.py index b9174ac5..389544df 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -1,5 +1,4 @@ # A desktop environment selector. - import archinstall is_top_level_profile = True @@ -44,8 +43,7 @@ def _prep_function(*args, **kwargs): other code in this stage. So it's a safe way to ask the user for more input before any other installer steps start. """ - - desktop = archinstall.generic_select(__supported__, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) + desktop = archinstall.Menu('Select your desired desktop environment', __supported__, skip=False).run() # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded diff --git a/profiles/i3.py b/profiles/i3.py index 39977b28..24956209 100644 --- a/profiles/i3.py +++ b/profiles/i3.py @@ -26,7 +26,8 @@ def _prep_function(*args, **kwargs): """ supported_configurations = ['i3-wm', 'i3-gaps'] - desktop = archinstall.generic_select(supported_configurations, 'Select your desired configuration: ', allow_empty_input=False, sort=True) + + desktop = archinstall.Menu('Select your desired configuration', supported_configurations, skip=False).run() # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded diff --git a/profiles/server.py b/profiles/server.py index 731d2005..c4f35f7b 100644 --- a/profiles/server.py +++ b/profiles/server.py @@ -27,8 +27,12 @@ def _prep_function(*args, **kwargs): before continuing any further. """ if not archinstall.storage.get('_selected_servers', None): - selected_servers = archinstall.generic_multi_select(available_servers, "Choose which servers to install and enable (leave blank for a minimal installation): ") - archinstall.storage['_selected_servers'] = selected_servers + servers = archinstall.Menu( + 'Choose which servers to install, if none then a minimal installation wil be done', available_servers, + multi=True + ).run() + + archinstall.storage['_selected_servers'] = servers return True |