mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
shellcheck fixes
This commit is contained in:
parent
7a51fa25dc
commit
16a7cea9dc
2 changed files with 2 additions and 0 deletions
|
@ -32,6 +32,7 @@ _create_iso() {
|
||||||
# create container
|
# create container
|
||||||
archboot-"${_ARCH}"-create-container.sh "${_W_DIR}" -cc --install-source="${2}" || exit 1
|
archboot-"${_ARCH}"-create-container.sh "${_W_DIR}" -cc --install-source="${2}" || exit 1
|
||||||
_create_archboot_db "${_W_DIR}${_CACHEDIR}"
|
_create_archboot_db "${_W_DIR}${_CACHEDIR}"
|
||||||
|
#shellcheck disable=SC1090
|
||||||
. "${_W_DIR}/etc/archboot/${_ARCH}.conf"
|
. "${_W_DIR}/etc/archboot/${_ARCH}.conf"
|
||||||
#shellcheck disable=SC2116,SC2046,SC2027
|
#shellcheck disable=SC2116,SC2046,SC2027
|
||||||
_KERNEL_VERSION="$(${_NSPAWN} "${_W_DIR}" /bin/bash -c "KERNEL="$(echo "${KERNEL}")";. /usr/lib/archboot/common.sh; _kver ${KERNEL}")"
|
_KERNEL_VERSION="$(${_NSPAWN} "${_W_DIR}" /bin/bash -c "KERNEL="$(echo "${KERNEL}")";. /usr/lib/archboot/common.sh; _kver ${KERNEL}")"
|
||||||
|
|
|
@ -24,6 +24,7 @@ _update_pacman_chroot() {
|
||||||
[[ -f pacman-${_ARCH}-chroot-latest.tar.zst ]] && rm pacman-"${_ARCH}"-chroot-latest.tar.zst{,.sig} 2>"${_NO_LOG}"
|
[[ -f pacman-${_ARCH}-chroot-latest.tar.zst ]] && rm pacman-"${_ARCH}"-chroot-latest.tar.zst{,.sig} 2>"${_NO_LOG}"
|
||||||
wget "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}"{,.sig} &>"${_NO_LOG}"
|
wget "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}"{,.sig} &>"${_NO_LOG}"
|
||||||
# verify download
|
# verify download
|
||||||
|
#shellcheck disable=SC2024
|
||||||
sudo -u "${_USER}" gpg --verify "${_PACMAN_CHROOT}.sig" &>"${_NO_LOG}" || exit 1
|
sudo -u "${_USER}" gpg --verify "${_PACMAN_CHROOT}.sig" &>"${_NO_LOG}" || exit 1
|
||||||
bsdtar -C "${_ARCH_DIR}" -xf "${_PACMAN_CHROOT}" &>"${_NO_LOG}"
|
bsdtar -C "${_ARCH_DIR}" -xf "${_PACMAN_CHROOT}" &>"${_NO_LOG}"
|
||||||
echo "Removing installation tarball..."
|
echo "Removing installation tarball..."
|
||||||
|
|
Loading…
Reference in a new issue