Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tom Yan
archiso
Commits
62e74c7e
Verified
Commit
62e74c7e
authored
Jun 05, 2021
by
nl6720
Browse files
mkarchiso: fix unbound variable when not using GPG signing
Fixes #138
parent
a9a4dc4f
Changes
1
Show whitespace changes
Inline
Side-by-side
archiso/mkarchiso
View file @
62e74c7e
...
...
@@ -320,16 +320,18 @@ _make_custom_airootfs() {
# Install desired packages to airootfs
_make_packages
()
{
local
envvars_in_chroot
=()
_msg_info
"Installing packages to '
${
pacstrap_dir
}
/'..."
if
[[
-n
"
${
gpg_key
}
"
]]
;
then
exec
{
ARCHISO_GNUPG_FD
}
<
>
"
${
work_dir
}
/pubkey.gpg"
envvars_in_chroot+
=(
"ARCHISO_GNUPG_FD=
${
ARCHISO_GNUPG_FD
}
"
)
fi
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
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
if
[[
-n
"
${
gpg_key
}
"
]]
;
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment