From 9b9d2d47e678a702ae00e0e3b0c43e9b93eec9f6 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 8 Oct 2022 21:37:00 +0200
Subject: [PATCH] fix local -full-system

---
 usr/lib/archboot/update-installer.sh | 16 +++++++---------
 usr/lib/archboot/xfce.sh             |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh
index 705a0c62c..dcfad4631 100644
--- a/usr/lib/archboot/update-installer.sh
+++ b/usr/lib/archboot/update-installer.sh
@@ -345,15 +345,13 @@ _prepare_graphic() {
         #shellcheck disable=SC2086
         pacman -Sy --config ${_PACMAN_CONF} >/dev/null 2>&1 || exit 1
         # check if already full system is used
-        if [[ ! -e "/.full-system" ]]; then
-            for i in ${_GRAPHIC}; do
-                #shellcheck disable=SC2086
-                pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
-                [[ ! -e "/.full-system" ]] &&_cleanup_install
-                [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
-                rm -f /var/log/pacman.log
-            done
-        fi
+        for i in ${_GRAPHIC}; do
+            #shellcheck disable=SC2086
+            pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
+            [[ ! -e "/.full-system" ]] &&_cleanup_install
+            [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
+            rm -f /var/log/pacman.log
+        done
     else
         echo "Updating environment to latest packages (ignoring packages: ${_GRAPHIC_IGNORE}) ..."
         _IGNORE=""
diff --git a/usr/lib/archboot/xfce.sh b/usr/lib/archboot/xfce.sh
index 086d52b27..f143c9f3b 100644
--- a/usr/lib/archboot/xfce.sh
+++ b/usr/lib/archboot/xfce.sh
@@ -6,7 +6,7 @@ _install_xfce() {
         echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop now ..."
         echo "          This will need some time ..."
         _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES}" >/dev/tty7 2>&1
-        echo -e "\033[1mStep 2/35:\033[0m Configuring XFCE desktop ..."
+        echo -e "\033[1mStep 2/3:\033[0m Configuring XFCE desktop ..."
         _configure_xfce >/dev/tty7 2>&1
     else
         echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop already done ..."