diff options
| author | npatra <nilesh@riseup.net> | 2025-11-25 09:50:35 +0100 |
|---|---|---|
| committer | Rutherther <rutherther@ditigal.xyz> | 2025-12-15 21:53:27 +0100 |
| commit | 669a6c8e992d4d4beb5b47a053f0a29f09ac5bf4 (patch) | |
| tree | bc0ed42f8a6e7ed2a29889c02de0f11042cc5a6f /etc | |
| parent | 1fea6b359fe2f5f7b4ac0b613966766a6dcdcea7 (diff) | |
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>
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 775a684258d..1d0e7fed107 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh | |||
| @@ -990,7 +990,6 @@ main_install() | |||
| 990 | chk_init_sys | 990 | chk_init_sys |
| 991 | add_init_sys_require | 991 | add_init_sys_require |
| 992 | chk_require "${REQUIRE[@]}" | 992 | chk_require "${REQUIRE[@]}" |
| 993 | chk_gpg_keyring | ||
| 994 | chk_sys_arch | 993 | chk_sys_arch |
| 995 | chk_sys_nscd | 994 | chk_sys_nscd |
| 996 | chk_existing | 995 | chk_existing |
| @@ -1001,6 +1000,7 @@ main_install() | |||
| 1001 | tmp_path="$(mktemp -t -d guix.XXXXXX)" | 1000 | tmp_path="$(mktemp -t -d guix.XXXXXX)" |
| 1002 | 1001 | ||
| 1003 | if [ -z "${GUIX_BINARY_FILE_NAME}" ]; then | 1002 | if [ -z "${GUIX_BINARY_FILE_NAME}" ]; then |
| 1003 | chk_gpg_keyring | ||
| 1004 | guix_get_bin_list "${GNU_URL}" | 1004 | guix_get_bin_list "${GNU_URL}" |
| 1005 | guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" | 1005 | guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" |
| 1006 | GUIX_BINARY_FILE_NAME=${BIN_VER}.tar.xz | 1006 | GUIX_BINARY_FILE_NAME=${BIN_VER}.tar.xz |
