tools/archiso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mkarchiso: fix unbound variable when not using GPG signing

Browse source 
Fixes #138
This commit is contained in:
nl6720 2021-06-05 08:23:14 +03:00
parent a9a4dc4f70
commit 62e74c7e79
No known key found for this signature in database
GPG key ID: 5CE88535E188D369
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
archiso/mkarchiso
View file

@ -320,16 +320,18 @@ _make_custom_airootfs() {
# Install desired packages to airootfs # Install desired packages to airootfs
_make_packages() { _make_packages() {
local envvars_in_chroot=()
_msg_info "Installing packages to '${pacstrap_dir}/'..." _msg_info "Installing packages to '${pacstrap_dir}/'..."
if [[ -n "${gpg_key}" ]]; then if [[ -n "${gpg_key}" ]]; then
exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg" exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
envvars_in_chroot+=("ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}")
fi fi
if [[ "${quiet}" = "y" ]]; then if [[ "${quiet}" = "y" ]]; then
env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
else else
env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
fi fi
if [[ -n "${gpg_key}" ]]; then if [[ -n "${gpg_key}" ]]; then