mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
run shellcheck
This commit is contained in:
parent
1cc06135c0
commit
77be0a9584
2 changed files with 3 additions and 1 deletions
|
@ -58,7 +58,7 @@ _prepare_kernel_initramfs_files() {
|
||||||
split -b 700M -d --additional-suffix=.img -a 1 \
|
split -b 700M -d --additional-suffix=.img -a 1 \
|
||||||
"${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-pre.img" "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-"
|
"${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-pre.img" "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-"
|
||||||
rm "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-pre.img"
|
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"
|
mv "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}-0.img" "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}.img"
|
||||||
fi
|
fi
|
||||||
mv "/usr/lib/initcpio/functions.old" "/usr/lib/initcpio/functions"
|
mv "/usr/lib/initcpio/functions.old" "/usr/lib/initcpio/functions"
|
||||||
|
|
|
@ -237,11 +237,13 @@ _launch_xfce() {
|
||||||
echo "Install packages ..."
|
echo "Install packages ..."
|
||||||
_INSTALL_SOURCE="file:///var/cache/pacman/pkg"
|
_INSTALL_SOURCE="file:///var/cache/pacman/pkg"
|
||||||
_create_pacman_conf
|
_create_pacman_conf
|
||||||
|
#shellcheck disable=SC2086
|
||||||
pacman -Sy ${X_PACKAGES} --config ${_PACMAN_CONF} --noconfirm || exit 1
|
pacman -Sy ${X_PACKAGES} --config ${_PACMAN_CONF} --noconfirm || exit 1
|
||||||
else
|
else
|
||||||
echo "Updating environment ..."
|
echo "Updating environment ..."
|
||||||
pacman -Syu --ignore linux --ignore linux-firmware || exit 1
|
pacman -Syu --ignore linux --ignore linux-firmware || exit 1
|
||||||
echo "Install packages ..."
|
echo "Install packages ..."
|
||||||
|
#shellcheck disable=SC2086
|
||||||
pacman -Sy ${X_PACKAGES} --noconfirm || exit 1
|
pacman -Sy ${X_PACKAGES} --noconfirm || exit 1
|
||||||
fi
|
fi
|
||||||
echo "Cleanup archboot environment ..."
|
echo "Cleanup archboot environment ..."
|
||||||
|
|
Loading…
Reference in a new issue