Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Taylor <dylan@dylanmtaylor.com>2021-04-08 21:23:29 -0400
committerDylan Taylor <dylan@dylanmtaylor.com>2021-04-08 21:24:21 -0400
commit82c5241946ec96223aebe6453c58845182290fbb (patch)
tree28848a7d26fa7c73124c76c187dcc19da4c1a453
parent7e161d187ced4275365cb958d8f066b697bcc141 (diff)
This might work to make the i3 profiles as small as possible
-rw-r--r--profiles/i3-gaps.py9
-rw-r--r--profiles/i3-wm.py9
-rw-r--r--profiles/i3.py10
3 files changed, 11 insertions, 17 deletions
diff --git a/profiles/i3-gaps.py b/profiles/i3-gaps.py
index 395e69f6..ddca34b7 100644
--- a/profiles/i3-gaps.py
+++ b/profiles/i3-gaps.py
@@ -9,14 +9,7 @@ def _prep_function(*args, **kwargs):
other code in this stage. So it's a safe way to ask the user
for more input before any other installer steps start.
"""
-
- # i3 requires a functioning Xorg installation.
- profile = archinstall.Profile(None, 'xorg')
- with profile.load_instructions(namespace='xorg.py') as imported:
- if hasattr(imported, '_prep_function'):
- return imported._prep_function()
- else:
- print('Deprecated (??): xorg profile has no _prep_function() anymore')
+ return True
if __name__ == 'i3-gaps':
# install the i3 group now
diff --git a/profiles/i3-wm.py b/profiles/i3-wm.py
index 4c3135e5..4a0415fc 100644
--- a/profiles/i3-wm.py
+++ b/profiles/i3-wm.py
@@ -9,14 +9,7 @@ def _prep_function(*args, **kwargs):
other code in this stage. So it's a safe way to ask the user
for more input before any other installer steps start.
"""
-
- # i3 requires a functioning Xorg installation.
- profile = archinstall.Profile(None, 'xorg')
- with profile.load_instructions(namespace='xorg.py') as imported:
- if hasattr(imported, '_prep_function'):
- return imported._prep_function()
- else:
- print('Deprecated (??): xorg profile has no _prep_function() anymore')
+ return True
if __name__ == 'i3-wm':
# install the i3 group now
diff --git a/profiles/i3.py b/profiles/i3.py
index c08f4d89..9f58e7eb 100644
--- a/profiles/i3.py
+++ b/profiles/i3.py
@@ -18,12 +18,20 @@ def _prep_function(*args, **kwargs):
supported_configurations = ['i3-wm', 'i3-gaps']
desktop = archinstall.generic_select(supported_configurations, 'Select your desired configuration: ')
-
+
# 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
+ # i3 requires a functioning Xorg installation.
+ profile = archinstall.Profile(None, 'xorg')
+ with profile.load_instructions(namespace='xorg.py') as imported:
+ if hasattr(imported, '_prep_function'):
+ return imported._prep_function()
+ 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: