diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh index 9409bd006..685cc6f25 100644 --- a/usr/lib/archboot/release.sh +++ b/usr/lib/archboot/release.sh @@ -109,8 +109,8 @@ _create_iso() { _EFISTUB="usr/lib/systemd/boot/efi/linuxaa64.efi.stub" _UCODE="${_AMD_UCODE}" # replace aarch64 Image.gz with Image kernel for UKI, compressed image is not working at the moment - cp "${_W_DIR}"/boot/Image boot/Image-archboot-${_ARCH} - _KERNEL_ARCHBOOT=boot/Image-archboot-${_ARCH} + cp "${_W_DIR}/boot/Image" "boot/Image-archboot-${_ARCH}" + _KERNEL_ARCHBOOT="boot/Image-archboot-${_ARCH}" fi rm -r "${_W_DIR:?}"/boot mv boot "${_W_DIR}" @@ -154,10 +154,14 @@ _create_iso() { # create sha256sums echo "Generating sha256sum..." for i in *; do - [[ -f "${i}" ]] && cksum -a sha256 "${i}" >> sha256sum.txt + if [[ -f "${i}" ]]; then + cksum -a sha256 "${i}" >> sha256sum.txt + fi done for i in boot/*; do - [[ -f "${i}" ]] && cksum -a sha256 "${i}" >> sha256sum.txt + if [[ -f "${i}" ]]; then + cksum -a sha256 "${i}" >> sha256sum.txt + fi done } # vim: set ft=sh ts=4 sw=4 et: diff --git a/usr/lib/archboot/server.sh b/usr/lib/archboot/server.sh index 9a18dd608..8c47fb17b 100644 --- a/usr/lib/archboot/server.sh +++ b/usr/lib/archboot/server.sh @@ -82,9 +82,13 @@ _create_archive() { _sign_sha256sum() { for i in $1; do #shellcheck disable=SC2086 - [[ -f "${i}" ]] && sudo -u "${_USER}" gpg ${_GPG} "${i}" - [[ -f "${i}" ]] && cksum -a sha256 "${i}" >> sha256sum.txt - [[ -f "${i}.sig" ]] && cksum -a sha256 "${i}.sig" >> sha256sum.txt + if [[ -f "${i}" ]]; then + sudo -u "${_USER}" gpg ${_GPG} "${i}" + cksum -a sha256 "${i}" >> sha256sum.txt + fi + if [[ -f "${i}.sig" ]]; then + cksum -a sha256 "${i}.sig" >> sha256sum.txt + fi done } diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html index b9d96d182..fee3f96a9 100644 --- a/usr/share/archboot/doc/archboot.html +++ b/usr/share/archboot/doc/archboot.html @@ -172,7 +172,7 @@

Archboot Homepage

-

Last update 05.02.2023 16:44 (c) Tobias Powalowski tpowa

+

Last update 05.02.2023 18:47 (c) Tobias Powalowski tpowa

Logo

Donate You like the project? I like coffee :-)