root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

move FIX_PACKAGES to extra function

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-04 09:34:36 +02:00
parent c31fbdc0f3
commit cc756411a0
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr/lib/archboot/update/desktop.sh
View file

@ -22,7 +22,7 @@ _prepare_graphic() {
_progress "2" "Removing firmware files..."
rm -rf /usr/lib/firmware
# fix libs first, then install packages from defaults
_GRAPHIC="${_FIX_PACKAGES} ${1}"
_GRAPHIC="${1}"
fi
touch /.archboot
(_IGNORE=""
@ -40,6 +40,14 @@ _prepare_graphic() {
if grep -q qxl /proc/modules; then
echo "${_GRAPHIC}" | grep -q xorg && _GRAPHIC="${_GRAPHIC} xf86-video-qxl"
fi
for i in ${_FIX_PACKAGES}; do
#shellcheck disable=SC2086
_progress "11" "Installing ${i} ..."
pacman -S ${i} --noconfirm &>"${_LOG}"
[[ ! -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
touch /.archboot
(for i in ${_GRAPHIC}; do
#shellcheck disable=SC2086