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

move all _PACKAGES initialization to common.sh

Browse source
This commit is contained in:
Tobias Powalowski 2024-09-09 14:15:56 +02:00
parent 0428c86c26
commit 274678334e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr/bin/archboot-quickinst.sh
View file

@ -42,7 +42,6 @@ _prepare_pacman() {
# package_installation # package_installation
_install_packages() { _install_packages() {
. /etc/archboot/defaults
_auto_packages _auto_packages
#shellcheck disable=SC2068 #shellcheck disable=SC2068
${_PACMAN} -S ${_PACKAGES[@]} ${_PACMAN} -S ${_PACKAGES[@]}

4
usr/lib/archboot/installer/common.sh
View file

@ -96,6 +96,10 @@ _local_pacman_conf() {
} }
_auto_packages() { _auto_packages() {
# add packages from Archboot defaults
. /etc/archboot/defaults
# remove linux-firmware packages first
_PACKAGES=(${_PACKAGES[@]/linux-firmware*})
# Add filesystem packages # Add filesystem packages
if ${_LSBLK} FSTYPE | rg -q 'bcachefs'; then if ${_LSBLK} FSTYPE | rg -q 'bcachefs'; then
! echo "${_PACKAGES[@]}" | rg -qw 'bcachefs-tools' && _PACKAGES+=(bcachefs-tools) ! echo "${_PACKAGES[@]}" | rg -qw 'bcachefs-tools' && _PACKAGES+=(bcachefs-tools)

3
usr/lib/archboot/installer/pacman.sh
View file

@ -62,9 +62,6 @@ _run_autoconfig() {
_install_packages() { _install_packages() {
_destdir_mounts || return 1 _destdir_mounts || return 1
# add packages from Archboot defaults
. /etc/archboot/defaults
_PACKAGES=(${_PACKAGES[@]/linux-firmware*})
_auto_packages _auto_packages
#shellcheck disable=SC2116,SC2068 #shellcheck disable=SC2116,SC2068
_dialog --title " Summary " --yesno "Next step will install the following packages for a minimal system:\n$(echo ${_PACKAGES[@]})\n\nYou can watch the progress on your ${_VC} console." 9 75 || return 1 _dialog --title " Summary " --yesno "Next step will install the following packages for a minimal system:\n$(echo ${_PACKAGES[@]})\n\nYou can watch the progress on your ${_VC} console." 9 75 || return 1