From 36868425877249d9bfd9664e617a6b7d8df81e1c Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 12:45:10 +0200 Subject: Spelling error on file --- profiles/dekstop.py | 45 --------------------------------------------- profiles/desktop.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 profiles/dekstop.py create mode 100644 profiles/desktop.py (limited to 'profiles') diff --git a/profiles/dekstop.py b/profiles/dekstop.py deleted file mode 100644 index 35a31c43..00000000 --- a/profiles/dekstop.py +++ /dev/null @@ -1,45 +0,0 @@ -# A desktop environment selector. - -import archinstall, os - -def _prep_function(*args, **kwargs): - """ - Magic function called by the importing installer - before continuing any further. It also avoids executing any - other code in this stage. So it's a safe way to ask the user - for more input before any other installer steps start. - """ - - supported_desktops = ['gnome', 'kde', 'awesome'] - desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') - - # Temporarly store the selected desktop profile - # in a session-safe location, since this module will get re-loaded - # the next time it gets executed. - archinstall.storage['_desktop_profile'] = desktop - - profile = archinstall.Profile(None, desktop) - # 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'): - return imported._prep_function() - else: - print(f"Deprecated (??): {desktop} profile has no _prep_function() anymore") - -if __name__ == 'desktop': - """ - This "profile" is a meta-profile. - There are no specific desktop-steps, it simply routes - the installer to whichever desktop environment/window manager was chosen. - - Maybe in the future, a network manager or similar things *could* be added here. - We should honor that Arch Linux does not officially endorse a desktop-setup, nor is - it trying to be a turn-key desktop distribution. - - There are plenty of desktop-turn-key-solutions based on Arch Linux, - this is therefor just a helper to get started - """ - - # TODO: Remove magic variable 'installation' and place it - # in archinstall.storage or archinstall.session/archinstall.installation - installation.install_profile(archinstall.storage['_desktop_profile']) \ No newline at end of file diff --git a/profiles/desktop.py b/profiles/desktop.py new file mode 100644 index 00000000..35a31c43 --- /dev/null +++ b/profiles/desktop.py @@ -0,0 +1,45 @@ +# A desktop environment selector. + +import archinstall, os + +def _prep_function(*args, **kwargs): + """ + Magic function called by the importing installer + before continuing any further. It also avoids executing any + other code in this stage. So it's a safe way to ask the user + for more input before any other installer steps start. + """ + + supported_desktops = ['gnome', 'kde', 'awesome'] + desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') + + # Temporarly store the selected desktop profile + # in a session-safe location, since this module will get re-loaded + # the next time it gets executed. + archinstall.storage['_desktop_profile'] = desktop + + profile = archinstall.Profile(None, desktop) + # 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'): + return imported._prep_function() + else: + print(f"Deprecated (??): {desktop} profile has no _prep_function() anymore") + +if __name__ == 'desktop': + """ + This "profile" is a meta-profile. + There are no specific desktop-steps, it simply routes + the installer to whichever desktop environment/window manager was chosen. + + Maybe in the future, a network manager or similar things *could* be added here. + We should honor that Arch Linux does not officially endorse a desktop-setup, nor is + it trying to be a turn-key desktop distribution. + + There are plenty of desktop-turn-key-solutions based on Arch Linux, + this is therefor just a helper to get started + """ + + # TODO: Remove magic variable 'installation' and place it + # in archinstall.storage or archinstall.session/archinstall.installation + installation.install_profile(archinstall.storage['_desktop_profile']) \ No newline at end of file -- cgit v1.2.3-54-g00ecf