Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-10-18 13:03:10 +0200
committerGitHub <noreply@github.com>2020-10-18 13:03:10 +0200
commitb6c5942da69e5eeb3db60f1af40e9f33db6800e9 (patch)
treeee402a841ece54bfb826a08b8061c53b5b646aef
parent90eff266576a5fc2fe9f690e835c876aa405fe6d (diff)
parentd95b9156817353436900b09d393c06dd05d46a9f (diff)
Merge pull request #52 from Torxed/profile
Implemented profiles/desktop.py
-rw-r--r--archinstall/__init__.py1
-rw-r--r--archinstall/lib/storage.py1
-rw-r--r--archinstall/lib/user_interaction.py28
-rw-r--r--profiles/desktop.py45
4 files changed, 75 insertions, 0 deletions
diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index ad4220f2..a05b8e95 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -11,3 +11,4 @@ from .lib.locale_helpers import *
from .lib.services import *
from .lib.packages import *
from .lib.output import *
+from .lib.storage import * \ No newline at end of file
diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py
new file mode 100644
index 00000000..2c621f83
--- /dev/null
+++ b/archinstall/lib/storage.py
@@ -0,0 +1 @@
+storage = {} \ No newline at end of file
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 23141fa9..e01859b3 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -5,6 +5,34 @@ from .locale_helpers import search_keyboard_layout
## TODO: Some inconsistencies between the selection processes.
## Some return the keys from the options, some the values?
+def generic_select(options, input_text="Select one of the above by index or absolute value: ", sort=True):
+ """
+ A generic select function that does not output anything
+ other than the options and their indexs. As an example:
+
+ generic_select(["first", "second", "third option"])
+ 1: first
+ 2: second
+ 3: third option
+ """
+
+ if type(options) == dict: options = list(options)
+ if sort: options = sorted(list(options))
+ if len(options) <= 0: raise RequirementError('generic_select() requires at least one option to operate.')
+
+ for index, option in enumerate(options):
+ print(f"{index}: {option}")
+
+ selected_option = input(input_text)
+ if selected_option.isdigit():
+ selected_option = options[int(selected_option)]
+ elif selected_option in options:
+ pass # We gave a correct absolute value
+ else:
+ raise RequirementError(f'Selected option "{selected_option}" does not exist in available options: {options}')
+
+ return selected_option
+
def select_disk(dict_o_disks):
"""
Asks the user to select a harddrive from the `dict_o_disks` selection.
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