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

simplify pacman

Browse source
This commit is contained in:
Tobias Powalowski 2023-09-06 14:38:57 +02:00
parent fafad9de53
commit b7f3dae070
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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() {

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

@ -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"