RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a session-storag. This is in an attempt to build away some magic functionality that might otherwise be hard to understand/maintain over a long period of time. Using this in profiles/desktop.py as a test.

This commit is contained in:
Anton Hvornum 2020-10-18 12:28:12 +02:00
parent ec49a42f2b
commit a73f0b0135
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archinstall/__init__.py
View File

@ -11,3 +11,4 @@ from .lib.locale_helpers import *
from .lib.services import * from .lib.services import *
from .lib.packages import * from .lib.packages import *
from .lib.output import * from .lib.output import *
from .lib.storage import *

1
archinstall/lib/storage.py Normal file
View File

@ -0,0 +1 @@
storage = {}

23
profiles/dekstop.py
View File

@ -13,6 +13,11 @@ def _prep_function(*args, **kwargs):
supported_desktops = ['gnome', 'kde', 'awesome'] supported_desktops = ['gnome', 'kde', 'awesome']
dektop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') dektop = 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, dektop) profile = archinstall.Profile(None, dektop)
# Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered.
with profile.load_instructions(namespace=f"{dektop}.py") as imported: with profile.load_instructions(namespace=f"{dektop}.py") as imported:
@ -22,11 +27,19 @@ def _prep_function(*args, **kwargs):
print(f"Deprecated (??): {dektop} profile has no _prep_function() anymore") print(f"Deprecated (??): {dektop} profile has no _prep_function() anymore")
if __name__ == 'desktop': if __name__ == 'desktop':
print('The desktop.py profile should never be executed as a stand-alone.')
""" """
This "profile" is a meta-profile. This "profile" is a meta-profile.
It will not return itself, there for this __name__ will never There are no specific desktop-steps, it simply routes
be executed. Instead, whatever profile was selected will have the installer to whichever desktop environment/window manager was chosen.
it's handle returned and that __name__ will be executed later on.
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'])