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, fix chroot tarball

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-17 11:37:25 +02:00
parent 2b1eadffaa
commit 3cc6e5a40e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/common.sh
View file

@ -315,7 +315,7 @@ _pacman_keyring() {
done
# gpg finished in background
while pgrep -x gpg &>"${_NO_LOG}"; do
read .r -t 1
read -r -t 1
done
if [[ -e /etc/systemd/system/pacman-init.service ]]; then
systemctl stop pacman-init.service

5
usr/lib/archboot/run/chroot-tarball.sh
View file

@ -65,9 +65,10 @@ rm -r "${1}"
echo "Finished container tarball."
echo "Signing tarball..."
#shellcheck disable=SC2086
sudo -u "${_USER}" gpg ${_GPG} ${_PACMAN_ARCH_CHROOT} || exit 1
run0 "${_USER}" gpg ${_GPG} ${_PACMAN_ARCH_CHROOT} || exit 1
chown "${_USER}":"${_GROUP}" "${_PACMAN_ARCH_CHROOT}"{,.sig} || exit 1
echo "Syncing tarball to ${_SERVER}:${_PUB}/.${_SERVER_PACMAN_ARCH}..."
sudo -u "${_USER}" "${_RSYNC}" "${_PACMAN_ARCH_CHROOT}"{,.sig} "${_SERVER}:${_PUB}/.${_SERVER_PACMAN_ARCH}" || exit 1
#shellcheck disable=SC2086
run0 "${_USER}" ${_RSYNC} "${_PACMAN_ARCH_CHROOT}"{,.sig} "${_SERVER}:${_PUB}/.${_SERVER_PACMAN_ARCH}" || exit 1
echo "Finished."
# vim: set ft=sh ts=4 sw=4 et: