From 4f97bfb212dbb9b06b303f9d4a2e8ab18556f4df Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 12 Jun 2022 14:45:45 +0200
Subject: [PATCH] rename KDE_PACKAGES to PLASMA_PACKAGES

---
 etc/archboot/defaults              | 4 ++--
 usr/lib/archboot/common.sh         | 2 +-
 usr/lib/archboot/plasma-wayland.sh | 2 +-
 usr/lib/archboot/plasma.sh         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index 7daeda56c..58f770fb5 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -11,13 +11,13 @@ _GRAPHIC_IGNORE="linux linux-firmware linux-firmware-marvell"
 _VNC_PW="archboot"
 ### XFCE defaults
 # Xfce packages
-_XFCE_PACKAGES="xfce4 breeze-icons gvfs gvfs-smb thunar-archive-plugin file-roller gnome-keyring mousepad ristretto"
+_XFCE_PACKAGES="xfce4 breeze-icons gvfs-smb thunar-archive-plugin file-roller gnome-keyring mousepad ristretto"
 ### GNOME defaults
 # GNOME packages
 _GNOME_PACKAGES="gnome-desktop-4 gnome-shell gnome-terminal gnome-control-center nautilus gvfs-smb gthumb file-roller gnome-keyring gedit"
 ### KDE defaults
 # KDE/Plasma packages
-_KDE_PACKAGES="plasma-wayland-session plasma-desktop konsole kscreen kwallet kio-extras kio-fuse kate dolphin powerdevil ark gwenview"
+_PLASMA_PACKAGES="plasma-wayland-session plasma-desktop konsole kscreen kwallet kio-extras kio-fuse kate dolphin powerdevil ark gwenview"
 ### Custom Graphical defaults
 # Custom packages
 _CUSTOM_XORG=""
diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index f4aaf90af..ad4b7f0ea 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -11,7 +11,7 @@ _XORG_PACKAGE="xorg"
 _VNC_PACKAGE="tigervnc"
 _WAYLAND_PACKAGE="egl-wayland"
 _STANDARD_PACKAGES="gparted nss-mdns chromium"
-_GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_KDE_PACKAGES}"
+_GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_PLASMA_PACKAGES}"
 
 ### check for root
 _root_check() {
diff --git a/usr/lib/archboot/plasma-wayland.sh b/usr/lib/archboot/plasma-wayland.sh
index 10add1186..9fd4ff645 100644
--- a/usr/lib/archboot/plasma-wayland.sh
+++ b/usr/lib/archboot/plasma-wayland.sh
@@ -5,7 +5,7 @@ _install_kde_wayland() {
     if ! [[ -e /usr/bin/startplasma-x11 ]]; then
         echo -e "\033[1mStep 3/5:\033[0m Installing KDE/Plasma Wayland now ..."
         echo "          This will need some time ..."
-        _prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_KDE_PACKAGES}" >/dev/tty7 2>&1
+        _prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_PLASMA_PACKAGES}" >/dev/tty7 2>&1
         echo -e "\033[1mStep 4/5:\033[0m Configuring KDE/Plasma Wayland ..."
         _configure_kde_wayland >/dev/tty7 2>&1
 	else
diff --git a/usr/lib/archboot/plasma.sh b/usr/lib/archboot/plasma.sh
index 3a79f754a..8e2dd20d0 100644
--- a/usr/lib/archboot/plasma.sh
+++ b/usr/lib/archboot/plasma.sh
@@ -5,7 +5,7 @@ _install_kde() {
     if ! [[ -e /usr/bin/startplasma-x11 ]]; then
         echo -e "\033[1mStep 3/5:\033[0m Installing KDE/Plasma desktop now ..."
         echo "          This will need some time ..."
-        _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_KDE_PACKAGES}" >/dev/tty7 2>&1
+        _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_PLASMA_PACKAGES}" >/dev/tty7 2>&1
         echo -e "\033[1mStep 4/5:\033[0m Configuring KDE desktop ..."
         _configure_kde >/dev/tty7 2>&1
 	else