From 6b923796762e70cd2948d18d10cc106769c6dee1 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 16 Jun 2024 11:45:47 +0200
Subject: [PATCH] move browser installation

---
 usr/bin/archboot-update.sh        | 1 -
 usr/lib/archboot/update/gnome.sh  | 3 ++-
 usr/lib/archboot/update/plasma.sh | 1 +
 usr/lib/archboot/update/sway.sh   | 1 +
 usr/lib/archboot/update/xfce.sh   | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/bin/archboot-update.sh b/usr/bin/archboot-update.sh
index c71e9e212..f4bf443b3 100755
--- a/usr/bin/archboot-update.sh
+++ b/usr/bin/archboot-update.sh
@@ -68,7 +68,6 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
     : > /.update
     _TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | Desktop Environment"
     [[ -e /var/cache/pacman/pkg/archboot.db ]] && : > /.graphic_installed
-    _prepare_browser | _dialog --title "${_MENU_TITLE}" --gauge "Installing ${_STANDARD_BROWSER}..." 6 75 0
     if [[ -n "${_L_XFCE}" ]]; then
         _ENVIRONMENT="XFCE"
         _install_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
diff --git a/usr/lib/archboot/update/gnome.sh b/usr/lib/archboot/update/gnome.sh
index bbb0edb2a..71d61565e 100644
--- a/usr/lib/archboot/update/gnome.sh
+++ b/usr/lib/archboot/update/gnome.sh
@@ -30,7 +30,8 @@ _prepare_gnome() {
     if ! [[ -e /usr/bin/gnome-session ]]; then
         _prepare_graphic "${_PACKAGES}"
     fi
-     _configure_gnome >"${_LOG}" 2>&1
+    _prepare_browser
+    _configure_gnome >"${_LOG}" 2>&1
 }
 
 _install_gnome() {
diff --git a/usr/lib/archboot/update/plasma.sh b/usr/lib/archboot/update/plasma.sh
index 8abab0545..5ca174425 100644
--- a/usr/lib/archboot/update/plasma.sh
+++ b/usr/lib/archboot/update/plasma.sh
@@ -64,6 +64,7 @@ _prepare_plasma() {
     if ! [[ -e /usr/bin/startplasma-x11 ]]; then
         _prepare_graphic "${_PACKAGES}"
     fi
+    _prepare_browser >"${_LOG}" 2>&1
     _configure_plasma >"${_LOG}" 2>&1
 }
 
diff --git a/usr/lib/archboot/update/sway.sh b/usr/lib/archboot/update/sway.sh
index b1fb0effe..0ba00b595 100644
--- a/usr/lib/archboot/update/sway.sh
+++ b/usr/lib/archboot/update/sway.sh
@@ -105,6 +105,7 @@ _install_sway() {
     if ! [[ -e /usr/bin/sway ]]; then
         _prepare_graphic "${_PACKAGES}"
     fi
+    _prepare_browser >"${_LOG}" 2>&1
     _configure_sway >"${_LOG}" 2>&1
 }
 
diff --git a/usr/lib/archboot/update/xfce.sh b/usr/lib/archboot/update/xfce.sh
index de78171c9..350dc149e 100644
--- a/usr/lib/archboot/update/xfce.sh
+++ b/usr/lib/archboot/update/xfce.sh
@@ -5,6 +5,7 @@ _install_xfce() {
     if ! [[ -e /usr/bin/startxfce4 ]]; then
         _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES}"
     fi
+    _prepare_browser
     _configure_xfce  >"${_LOG}" 2>&1
 }