index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2021-04-10 11:22:15 +0200 |
---|---|---|
committer | Anton Hvornum <anton@hvornum.se> | 2021-04-10 11:22:15 +0200 |
commit | 8429510736b0750510c4ac1d9f281755b195bb11 (patch) | |
tree | d82cdbb2af6545cf8eef80bf583fe507e588cb8e /profiles/i3.py | |
parent | 48e801e6fdbc1f74885a3541011d4cce5876ab21 (diff) | |
parent | f1b42216a7393e58a02f2e885293efe88304cada (diff) |
-rw-r--r-- | profiles/i3.py | 17 |
diff --git a/profiles/i3.py b/profiles/i3.py index 9f58e7eb..bc6dc2ca 100644 --- a/profiles/i3.py +++ b/profiles/i3.py @@ -22,7 +22,7 @@ def _prep_function(*args, **kwargs): # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded # the next time it gets executed. - archinstall.storage['_desktop_profile'] = desktop + archinstall.storage['_i3_configuration'] = desktop # i3 requires a functioning Xorg installation. profile = archinstall.Profile(None, 'xorg') @@ -32,14 +32,6 @@ def _prep_function(*args, **kwargs): else: print('Deprecated (??): xorg profile has no _prep_function() anymore') - 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__ == 'i3': """ This "profile" is a meta-profile. @@ -66,7 +58,6 @@ if __name__ == 'i3': # Auto start lightdm for all users installation.enable_service('lightdm') - # TODO: Remove magic variable 'installation' and place it - # in archinstall.storage or archinstall.session/archinstall.installation - installation.install_profile(archinstall.storage['_desktop_profile']) - + # install the i3 group now + i3 = archinstall.Application(installation, archinstall.storage['_i3_configuration']) + i3.install() |