Merging in latest changes from master and resolved conflicts.

1 files changed, 43 insertions, 0 deletions

diff --git a/profiles/enlightenment.py b/profiles/enlightenment.py
new file mode 100644
index 00000000..3850fed0
--- /dev/null
+++ b/profiles/enlightenment.py
@@ -0,0 +1,43 @@
+# A desktop environment using "Enlightenment".
+
+import archinstall
+
+is_top_level_profile = False
+
+__packages__ = [
+	"enlightenment",
+	"terminology",
+	"lightdm",
+	"lightdm-gtk-greeter",
+]
+
+
+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.
+	"""
+
+	# Enlightenment 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')
+
+
+# Ensures that this code only gets executed if executed
+# through importlib.util.spec_from_file_location("enlightenment", "/somewhere/enlightenment.py")
+# or through conventional import enlightenment
+if __name__ == 'enlightenment':
+	# Install dependency profiles
+	archinstall.storage['installation_session'].install_profile('xorg')
+
+	# Install the enlightenment packages
+	archinstall.storage['installation_session'].add_additional_packages(__packages__)
+
+	# Enable autostart of enlightenment for all users
+	archinstall.storage['installation_session'].enable_service('lightdm')