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

shellcheck fixes

Browse source
This commit is contained in:
Tobias Powalowski 2022-09-23 08:50:09 +02:00
parent 78ba5a087f
commit 341a40975d
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ prepare_pacman() {
${PACMAN} -Sy
KEYRING="archlinux-keyring"
[[ "$(uname -m)" == "aarch64" ]] && KEYRING="${KEYRING} archlinuxarm-keyring"
#shellcheck disable=SC2086
pacman -Sy ${PACMAN_CONF} --noconfirm --noprogressbar ${KEYRING} || exit 1
}

2
usr/lib/archboot/installer/autoconfiguration.sh
View file

@ -120,7 +120,7 @@ auto_mkinitcpio() {
reader="cat"
# try if the image is gzip compressed
[[ $(file -b --mime-type "${DESTDIR}/boot/${VMLINUZ}") == 'application/gzip' ]] && reader="zcat"
read _ _ HWKVER _ < <($reader "${DESTDIR}/boot/${VMLINUZ}" | grep -m1 -aoE 'Linux version .(\.[-[:alnum:]]+)+')
read -r _ _ HWKVER _ < <($reader "${DESTDIR}/boot/${VMLINUZ}" | grep -m1 -aoE 'Linux version .(\.[-[:alnum:]]+)+')
fi
# arrange MODULES for mkinitcpio.conf
HWDETECTMODULES="$(hwdetect --kernel_directory="${DESTDIR}" --kernel_version="${HWKVER}" --hostcontroller --filesystem ${FBPARAMETER})"

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

@ -116,7 +116,8 @@ prepare_pacman() {
DIALOG --infobox "Update Arch Linux keyring ..." 3 40
KEYRING="archlinux-keyring"
[[ "${RUNNING_ARCH}" == "aarch64" ]] && KEYRING="${KEYRING} archlinuxarm-keyring"
pacman -Sy ${PACMAN_CONF} --noconfirm --noprogressbar ${KEYRING} > "${LOG}" 2>&1 || (DIALOG --msgbox "Keyring update failed! Check ${LOG} for errors." 6 60; return 1)
#shellcheck disable=SC2086
pacman -Sy "${PACMAN_CONF}" --noconfirm --noprogressbar ${KEYRING} > "${LOG}" 2>&1 || (DIALOG --msgbox "Keyring update failed! Check ${LOG} for errors." 6 60; return 1)
}
# Set PACKAGES parameter before running to install wanted packages

3
usr/lib/archboot/iso.sh
View file

@ -89,8 +89,9 @@ _prepare_kernel_initramfs_files() {
# - only left option is extlinux support in u-boot loader
_prepare_kernel_initramfs_files_RISCV64() {
echo "Prepare RISCV64 u-boot ..."
#shellcheck disable=SC1090
source "${_PRESET}"
mkdir -p ${_ISODIR}/boot/extlinux
mkdir -p "${_ISODIR}"/boot/extlinux
install -m644 "${ALL_kver}" "${_ISODIR}/boot/vmlinuz_${_RUNNING_ARCH}"
mkinitcpio -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}.img" || exit 1
}