From 4e17355796b257ea6af306f6b3af3e8fb78f94e4 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 13 Jun 2021 08:32:38 -0400 Subject: Implement is_desktop_profile helper function (#575) * Implement is_desktop_profile helper function * Make ask_for_audio_selection use generic_select * Fix default value for audio selection * Leverage list of supported desktops to perform is_desktop_profile check * is_desktop_profile was missing a default return value * Store return value for audio server --- profiles/desktop.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'profiles/desktop.py') diff --git a/profiles/desktop.py b/profiles/desktop.py index 73df9256..c0710208 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -21,6 +21,21 @@ __packages__ = [ 'xdg-utils', ] +__supported__ = [ + 'gnome', + 'kde', + 'awesome', + 'sway', + 'cinnamon', + 'xfce4', + 'lxqt', + 'i3', + 'budgie', + 'mate', + 'deepin', + 'enlightenment', +] + def _prep_function(*args, **kwargs): """ @@ -30,22 +45,7 @@ def _prep_function(*args, **kwargs): for more input before any other installer steps start. """ - supported_desktops = [ - 'gnome', - 'kde', - 'awesome', - 'sway', - 'cinnamon', - 'xfce4', - 'lxqt', - 'i3', - 'budgie', - 'mate', - 'deepin', - 'enlightenment', - ] - - desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) + desktop = archinstall.generic_select(__supported__, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded -- cgit v1.2.3-70-g09d2 From d30a22cae3e7a37d4141d3a6128e83fc3d47f9be Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 13 Jun 2021 18:22:24 +0530 Subject: Setting proper keys in exported config (#557) * Set the resolved profile path to the actual desktop environment * split Nvidia driver list into proprietary and open-source * Updated select_driver to use archinstall.arguments for driver selection * Adding default value that works with later .get() * audio will now be prompted irrespective of profile --- archinstall/lib/user_interaction.py | 28 +++++++++------------------- profiles/desktop.py | 2 ++ 2 files changed, 11 insertions(+), 19 deletions(-) (limited to 'profiles/desktop.py') diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 6ef70aa2..2c5810ae 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -16,7 +16,7 @@ from .locale_helpers import list_keyboard_languages, verify_keyboard_layout, sea from .networking import list_interfaces from .output import log from .profiles import Profile, list_profiles - +from .storage import * # TODO: Some inconsistencies between the selection processes. # Some return the keys from the options, some the values? @@ -700,9 +700,9 @@ def select_driver(options=AVAILABLE_GFX_DRIVERS): """ drivers = sorted(list(options)) - default_option = options["All open-source (default)"] - + if drivers: + arguments = storage.get('arguments', {}) if has_amd_graphics(): print('For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options.') if has_intel_graphics(): @@ -710,22 +710,12 @@ def select_driver(options=AVAILABLE_GFX_DRIVERS): if has_nvidia_graphics(): print('For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.') - initial_option = generic_select(drivers, input_text="Select your graphics card driver: ") - - if not initial_option: - return default_option - - selected_driver = options[initial_option] - - if type(selected_driver) == dict: - driver_options = sorted(list(selected_driver)) - - driver_package_group = generic_select(driver_options, f'Which driver-type do you want for {initial_option}: ', allow_empty_input=False) - driver_package_group = selected_driver[driver_package_group] - - return driver_package_group - - return selected_driver + arguments['gfx_driver'] = generic_select(drivers, input_text="Select your graphics card driver: ") + + if arguments.get('gfx_driver', None) is None: + arguments['gfx_driver'] = "All open-source (default)" + + return options.get(arguments.get('gfx_driver')) raise RequirementError("Selecting drivers require a least one profile to be given as an option.") diff --git a/profiles/desktop.py b/profiles/desktop.py index c0710208..eaf145c2 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -54,6 +54,8 @@ def _prep_function(*args, **kwargs): archinstall.storage['_desktop_profile'] = desktop profile = archinstall.Profile(None, desktop) + # Set the resolved profile path to the actual desktop environment + archinstall.arguments['profile'] = profile # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. with profile.load_instructions(namespace=f"{desktop}.py") as imported: if hasattr(imported, '_prep_function'): -- cgit v1.2.3-70-g09d2