From b7f3dae07031c15527cb8f123de4400467fb3dd3 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 6 Sep 2023 14:38:57 +0200
Subject: [PATCH] simplify pacman

---
 usr/lib/archboot/installer/common.sh | 4 ++--
 usr/lib/archboot/installer/pacman.sh | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index bc8ed8587..9579d73e3 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -28,7 +28,7 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
     _VMLINUZ_EFISTUB="Image"
 fi
 # abstract the common pacman args
-_PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm --progressbar"
+_PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm"
 
 _linux_firmware() {
     _PACKAGES="${_PACKAGES//\ linux-firmware\ / }"
@@ -91,7 +91,7 @@ _local_pacman_conf() {
     echo "[archboot]" >> "${_PACMAN_CONF}"
     echo "Server = file://${_CACHEDIR}" >> "${_PACMAN_CONF}"
     _PACMAN_CONF="--config ${_PACMAN_CONF}"
-    _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm --progressbar"
+    _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm"
 }
 
 _auto_packages() {
diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh
index 7a53c39b6..142ab237a 100644
--- a/usr/lib/archboot/installer/pacman.sh
+++ b/usr/lib/archboot/installer/pacman.sh
@@ -5,7 +5,7 @@
 
 _pacman() {
     #shellcheck disable=SC2086,SC2069
-    ${_PACMAN} -Sy ${_PACKAGES} &>"${_LOG}" && : > /.pacman-success
+    ${_PACMAN} -Sy ${_PACKAGES} >"${_LOG}" && : > /.pacman-success
     rm /.archboot
 }
 
@@ -14,7 +14,6 @@ _run_pacman(){
     # Set up the necessary directories for pacman use
     [[ ! -d "${_DESTDIR}${_CACHEDIR}" ]] && mkdir -p "${_DESTDIR}${_CACHEDIR}"
     [[ ! -d "${_DESTDIR}${_PACMAN_LIB}" ]] && mkdir -p "${_DESTDIR}${_PACMAN_LIB}"
-    echo "Installing Packages..." >/tmp/pacman.log
     : > /.archboot
     _pacman &
     _progress_wait "0" "99" "Installing package(s):\n${_PACKAGES}..." "2"