mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 03:55:08 -06:00
guix-install.sh: Check for gpg keys only if downloading tarball from ftp.
* etc/guix-install.sh (main_install): Call chk_gpg_keyring only if GUIX_BINARY_FILE_NAME is not set. Change-Id: Ia0a7449c8798ca7d61a0f1f1e793f2bafd521c5b Signed-off-by: npatra <nilesh@riseup.net> Signed-off-by: Rutherther <rutherther@ditigal.xyz>
This commit is contained in:
parent
1fea6b359f
commit
669a6c8e99
1 changed files with 1 additions and 1 deletions
|
|
@ -990,7 +990,6 @@ main_install()
|
||||||
chk_init_sys
|
chk_init_sys
|
||||||
add_init_sys_require
|
add_init_sys_require
|
||||||
chk_require "${REQUIRE[@]}"
|
chk_require "${REQUIRE[@]}"
|
||||||
chk_gpg_keyring
|
|
||||||
chk_sys_arch
|
chk_sys_arch
|
||||||
chk_sys_nscd
|
chk_sys_nscd
|
||||||
chk_existing
|
chk_existing
|
||||||
|
|
@ -1001,6 +1000,7 @@ main_install()
|
||||||
tmp_path="$(mktemp -t -d guix.XXXXXX)"
|
tmp_path="$(mktemp -t -d guix.XXXXXX)"
|
||||||
|
|
||||||
if [ -z "${GUIX_BINARY_FILE_NAME}" ]; then
|
if [ -z "${GUIX_BINARY_FILE_NAME}" ]; then
|
||||||
|
chk_gpg_keyring
|
||||||
guix_get_bin_list "${GNU_URL}"
|
guix_get_bin_list "${GNU_URL}"
|
||||||
guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path"
|
guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path"
|
||||||
GUIX_BINARY_FILE_NAME=${BIN_VER}.tar.xz
|
GUIX_BINARY_FILE_NAME=${BIN_VER}.tar.xz
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue