From 77be0a958457d1c4388c62f97f27dd4f56d74547 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 3 May 2022 21:31:09 +0200 Subject: [PATCH] run shellcheck --- usr/lib/archboot/iso.sh | 2 +- usr/lib/archboot/update-installer.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh index 18678a2df..87a2d5b6e 100644 --- a/usr/lib/archboot/iso.sh +++ b/usr/lib/archboot/iso.sh @@ -58,7 +58,7 @@ _prepare_kernel_initramfs_files() { split -b 700M -d --additional-suffix=.img -a 1 \ "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-pre.img" "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-" rm "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-pre.img" - if [[ "$(find "${_ISODIR}/boot" -name *.img | wc -l)" -lt "2" ]]; then + if [[ "$(find "${_ISODIR}/boot" -name '*.img' | wc -l)" -lt "2" ]]; then mv "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-0.img" "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}.img" fi mv "/usr/lib/initcpio/functions.old" "/usr/lib/initcpio/functions" diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh index ba1d5eb71..0b59b1ab2 100644 --- a/usr/lib/archboot/update-installer.sh +++ b/usr/lib/archboot/update-installer.sh @@ -237,11 +237,13 @@ _launch_xfce() { echo "Install packages ..." _INSTALL_SOURCE="file:///var/cache/pacman/pkg" _create_pacman_conf + #shellcheck disable=SC2086 pacman -Sy ${X_PACKAGES} --config ${_PACMAN_CONF} --noconfirm || exit 1 else echo "Updating environment ..." pacman -Syu --ignore linux --ignore linux-firmware || exit 1 echo "Install packages ..." + #shellcheck disable=SC2086 pacman -Sy ${X_PACKAGES} --noconfirm || exit 1 fi echo "Cleanup archboot environment ..."