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

Merge pull request #327 from dylanmtaylor/patch-4 

Fix budgie.py merge issue
This commit is contained in:
Anton Hvornum 2021-04-20 16:30:00 +00:00 committed by GitHub
parent 636a7b95d5 b46afad1af
commit 752d7b7a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
profiles/budgie.py
View File

@ -1,13 +1,7 @@
<<<<<<< HEAD:profiles/cinnamon.py
# A desktop environment using "Cinnamon"
import archinstall
=======
# A desktop environment using "budgie" # A desktop environment using "budgie"
import archinstall import archinstall
>>>>>>> master:profiles/budgie.py
is_top_level_profile = False is_top_level_profile = False
def _prep_function(*args, **kwargs): def _prep_function(*args, **kwargs):
@ -18,11 +12,7 @@ def _prep_function(*args, **kwargs):
for more input before any other installer steps start. 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. # budgie requires a functioning Xorg installation.
>>>>>>> master:profiles/budgie.py
profile = archinstall.Profile(None, 'xorg') profile = archinstall.Profile(None, 'xorg')
with profile.load_instructions(namespace='xorg.py') as imported: with profile.load_instructions(namespace='xorg.py') as imported:
if hasattr(imported, '_prep_function'): if hasattr(imported, '_prep_function'):
@ -31,17 +21,6 @@ def _prep_function(*args, **kwargs):
print('Deprecated (??): xorg profile has no _prep_function() anymore') print('Deprecated (??): xorg profile has no _prep_function() anymore')
# Ensures that this code only gets executed if executed # 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") # through importlib.util.spec_from_file_location("budgie", "/somewhere/budgie.py")
# or through conventional import budgie # or through conventional import budgie
if __name__ == 'budgie': if __name__ == 'budgie':
@ -51,6 +30,5 @@ if __name__ == 'budgie':
# Install the application budgie from the template under /applications/ # Install the application budgie from the template under /applications/
budgie = archinstall.Application(installation, 'budgie') budgie = archinstall.Application(installation, 'budgie')
budgie.install() budgie.install()
>>>>>>> master:profiles/budgie.py
installation.enable_service('lightdm') # Light Display Manager installation.enable_service('lightdm') # Light Display Manager