From 8208b49908722cb6bc8b945586341a2d7f01ddf6 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 4 Oct 2022 09:49:55 +0200
Subject: [PATCH] move gnome install to gnome_prepare

---
 usr/lib/archboot/common.sh        | 14 ++++++++++++++
 usr/lib/archboot/gnome-wayland.sh | 15 ++-------------
 usr/lib/archboot/gnome.sh         | 14 ++------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index de88c7a91..807b8c23f 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -169,6 +169,20 @@ _cachedir_check() {
     fi
 }
 
+_prepare_gnome() {
+    if ! [[ -e /usr/bin/gnome-session ]]; then
+        echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop now ..."
+        echo "          This will need some time ..."
+        _prepare_graphic "${_PACKAGES}"
+        echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop ..."
+        _configure_gnome
+        systemd-sysusers
+        systemd-tmpfiles --create
+    else
+        echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop already done ..."
+        echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop already done ..."
+    fi
+}
 
 _configure_gnome() {
     echo "Configuring Gnome ..."
diff --git a/usr/lib/archboot/gnome-wayland.sh b/usr/lib/archboot/gnome-wayland.sh
index 6ba0de295..1ee4a44b2 100644
--- a/usr/lib/archboot/gnome-wayland.sh
+++ b/usr/lib/archboot/gnome-wayland.sh
@@ -2,21 +2,10 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 
 _install_gnome_wayland() {
-    if ! [[ -e /usr/bin/gnome-session ]]; then
-        echo -e "\033[1mStep 3/5:\033[0m Installing GNOME Wayland now ..."
-        echo "          This will need some time ..."
-        _prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
-        echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME Wayland ..."
-        _configure_gnome >/dev/tty7 2>&1
-        systemd-sysusers >/dev/tty7 2>&1
-        systemd-tmpfiles --create >/dev/tty7 2>&1
-    else
-        echo -e "\033[1mStep 3/5:\033[0m Installing GNOME Wayland already done ..."
-        echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME Wayland already done ..."
-    fi
+    _PACKAGES="${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}"
+    _prepare_gnome >/dev/tty7 2>&1
 }
 
-
 _start_gnome_wayland() {
     echo -e "Launching GNOME Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..."
     echo -e "To relaunch GNOME Wayland use: \033[92mgnome-wayland\033[0m"
diff --git a/usr/lib/archboot/gnome.sh b/usr/lib/archboot/gnome.sh
index c30e051e7..36d8c84ad 100644
--- a/usr/lib/archboot/gnome.sh
+++ b/usr/lib/archboot/gnome.sh
@@ -2,18 +2,8 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 
 _install_gnome() {
-    if ! [[ -e /usr/bin/gnome-session ]]; then
-        echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop now ..."
-        echo "          This will need some time ..."
-        _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
-        echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop ..."
-        _configure_gnome >/dev/tty7 2>&1
-        systemd-sysusers >/dev/tty7 2>&1
-        systemd-tmpfiles --create >/dev/tty7 2>&1
-    else
-        echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop already done ..."
-        echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop already done ..."
-    fi
+    _PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}"
+    _prepare_gnome >/dev/tty7 2>&1
 }
 
 _start_gnome() {