Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorDylan M. Taylor <dylan@dylanmtaylor.com>2021-04-20 12:27:17 -0400
committerGitHub <noreply@github.com>2021-04-20 12:27:17 -0400
commitb46afad1afb7d9e6621e86b3a512006c93ab8936 (patch)
tree60b035a61403278c991012db9c4c1804289ad524 /profiles
parent636a7b95d52c48e795d728daa02167fbea086d2c (diff)
Fix budgie.py merge issue
Diffstat (limited to 'profiles')
-rw-r--r--profiles/budgie.py22
1 files changed, 0 insertions, 22 deletions
diff --git a/profiles/budgie.py b/profiles/budgie.py
index 1f224209..6c5475ae 100644
--- a/profiles/budgie.py
+++ b/profiles/budgie.py
@@ -1,13 +1,7 @@
-<<<<<<< HEAD:profiles/cinnamon.py
-# A desktop environment using "Cinnamon"
-import archinstall
-
-=======
# A desktop environment using "budgie"
import archinstall
->>>>>>> master:profiles/budgie.py
is_top_level_profile = False
def _prep_function(*args, **kwargs):
@@ -18,11 +12,7 @@ def _prep_function(*args, **kwargs):
for more input before any other installer steps start.
"""
-<<<<<<< HEAD:profiles/cinnamon.py
- # Cinnamon requires a functioning Xorg installation.
-=======
# budgie requires a functioning Xorg installation.
->>>>>>> master:profiles/budgie.py
profile = archinstall.Profile(None, 'xorg')
with profile.load_instructions(namespace='xorg.py') as imported:
if hasattr(imported, '_prep_function'):
@@ -31,17 +21,6 @@ def _prep_function(*args, **kwargs):
print('Deprecated (??): xorg profile has no _prep_function() anymore')
# Ensures that this code only gets executed if executed
-<<<<<<< HEAD:profiles/cinnamon.py
-# through importlib.util.spec_from_file_location("cinnamon", "/somewhere/cinnamon.py")
-# or through conventional import cinnamon
-if __name__ == 'cinnamon':
- # Install dependency profiles
- installation.install_profile('xorg')
-
- # Install the application cinnamon from the template under /applications/
- cinnamon = archinstall.Application(installation, 'cinnamon')
- cinnamon.install()
-=======
# through importlib.util.spec_from_file_location("budgie", "/somewhere/budgie.py")
# or through conventional import budgie
if __name__ == 'budgie':
@@ -51,6 +30,5 @@ if __name__ == 'budgie':
# Install the application budgie from the template under /applications/
budgie = archinstall.Application(installation, 'budgie')
budgie.install()
->>>>>>> master:profiles/budgie.py
installation.enable_service('lightdm') # Light Display Manager