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

added new key for desktop-environment

This commit is contained in:
Yash Tripathi 2021-07-18 21:17:20 +05:30
parent b1998ddebf
commit b2476313a7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/guided.py
View File

@ -37,6 +37,7 @@ def load_config():
archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)['path']) archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)['path'])
else: else:
archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)) archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
archinstall.storage['_desktop_profile'] = archinstall.arguments.get('desktop-environment', None)
if archinstall.arguments.get('mirror-region', None) is not None: if archinstall.arguments.get('mirror-region', None) is not None:
if type(archinstall.arguments.get('mirror-region', None)) is dict: if type(archinstall.arguments.get('mirror-region', None)) is dict:
archinstall.arguments['mirror-region'] = archinstall.arguments.get('mirror-region', None) archinstall.arguments['mirror-region'] = archinstall.arguments.get('mirror-region', None)

4
profiles/desktop.py
View File

@ -52,10 +52,8 @@ def _prep_function(*args, **kwargs):
# the next time it gets executed. # the next time it gets executed.
if '_desktop_profile' not in archinstall.storage.keys(): if '_desktop_profile' not in archinstall.storage.keys():
archinstall.storage['_desktop_profile'] = desktop archinstall.storage['_desktop_profile'] = desktop
archinstall.arguments['desktop-environment'] = desktop
profile = archinstall.Profile(None, 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. # 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: with profile.load_instructions(namespace=f"{desktop}.py") as imported:
if hasattr(imported, '_prep_function'): if hasattr(imported, '_prep_function'):