From f91c0137d5f9a5f01229f21e62e81e52e41635ce Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:14:18 -0400 Subject: Remove refs to application profiles that were removed --- profiles/cinnamon.py | 5 ++--- profiles/deepin.py | 5 ++--- profiles/gnome.py | 5 ++--- profiles/lxqt.py | 5 ++--- profiles/mate.py | 5 ++--- profiles/sway.py | 5 ++--- profiles/xfce4.py | 5 ++--- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py index 91a59811..a8b89031 100644 --- a/profiles/cinnamon.py +++ b/profiles/cinnamon.py @@ -27,8 +27,7 @@ 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() + # Install the Cinnamon packages + installation.add_additional_packages(__packages__) installation.enable_service('lightdm') # Light Display Manager diff --git a/profiles/deepin.py b/profiles/deepin.py index 52bcdde5..f476f7e3 100644 --- a/profiles/deepin.py +++ b/profiles/deepin.py @@ -29,9 +29,8 @@ if __name__ == 'deepin': # Install dependency profiles installation.install_profile('xorg') - # Install the application deepin from the template under /applications/ - deepin = archinstall.Application(installation, 'deepin') - deepin.install() + # Install the Deepin packages + installation.add_additional_packages(__packages__) # Enable autostart of Deepin for all users installation.enable_service('lightdm') diff --git a/profiles/gnome.py b/profiles/gnome.py index c75cafee..cc80a606 100644 --- a/profiles/gnome.py +++ b/profiles/gnome.py @@ -28,9 +28,8 @@ if __name__ == 'gnome': # Install dependency profiles installation.install_profile('xorg') - # Install the application gnome from the template under /applications/ - gnome = archinstall.Application(installation, 'gnome') - gnome.install() + # Install the GNOME packages + installation.add_additional_packages(__packages__) installation.enable_service('gdm') # Gnome Display Manager # We could also start it via xinitrc since we do have Xorg, diff --git a/profiles/lxqt.py b/profiles/lxqt.py index 871488ee..e1ac8ab7 100644 --- a/profiles/lxqt.py +++ b/profiles/lxqt.py @@ -28,8 +28,7 @@ if __name__ == 'lxqt': # Install dependency profiles installation.install_profile('xorg') - # Install the application xfce4 from the template under /applications/ - xfce = archinstall.Application(installation, 'lxqt') - xfce.install() + # Install the LXQt packages + installation.add_additional_packages(__packages__) installation.enable_service('sddm') # SDDM Display Manager diff --git a/profiles/mate.py b/profiles/mate.py index b4c697b1..3b48d0ab 100644 --- a/profiles/mate.py +++ b/profiles/mate.py @@ -27,8 +27,7 @@ if __name__ == 'mate': # Install dependency profiles installation.install_profile('xorg') - # Install the application mate from the template under /applications/ - mate = archinstall.Application(installation, 'mate') - mate.install() + # Install the MATE packages + installation.add_additional_packages(__packages__) installation.enable_service('lightdm') # Light Display Manager diff --git a/profiles/sway.py b/profiles/sway.py index c3a6e31a..84ea049b 100644 --- a/profiles/sway.py +++ b/profiles/sway.py @@ -24,6 +24,5 @@ def _prep_function(*args, **kwargs): # through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py") # or through conventional import sway if __name__ == 'sway': - # Install the application sway from the template under /applications/ - sway = archinstall.Application(installation, 'sway') - sway.install() + # Install the Sway packages + installation.add_additional_packages(__packages__) diff --git a/profiles/xfce4.py b/profiles/xfce4.py index fee8c37a..ffe4a3c0 100644 --- a/profiles/xfce4.py +++ b/profiles/xfce4.py @@ -28,8 +28,7 @@ if __name__ == 'xfce4': # Install dependency profiles installation.install_profile('xorg') - # Install the application xfce4 from the template under /applications/ - xfce = archinstall.Application(installation, 'xfce4') - xfce.install() + # Install the XFCE4 packages + installation.add_additional_packages(__packages__) installation.enable_service('lightdm') # Light Display Manager -- cgit v1.2.3-70-g09d2