From patchwork Sun May 17 17:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22166 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B304027BBE3; Sun, 17 May 2020 18:19:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 685A227BBE1 for ; Sun, 17 May 2020 18:19:58 +0100 (BST) Received: from localhost ([::1]:43746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxB-0001EC-VK for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwT-0008Rm-9n for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0004O7-VD for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwS-0007Bm-Ri for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 11/28] guix-install.sh: Use a variable for GPG key URL. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592127446 (code B ref 40601); Sun, 17 May 2020 17:19:12 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:41 +0000 Received: from localhost ([127.0.0.1]:44616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvw-00078W-JJ for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:40 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvE-00071n-Vo for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:11 -0400 Received: by mail-wm1-f67.google.com with SMTP id n5so7786936wmd.0 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QzlDsQONmLEKuCM6RMBYCmP6K47406rcRFrwfkpDmdI=; b=XDW9zAVvreEZN8U3syTDnHOHnN6JmUsRdLX0twZYgScaPpVMwy1WIZW7gsCzzmWref nToc4VeiGXwE9zcxg+aKfB8dwOgx8kw/bZRGKR0JbJkCn6VUs6kCbhvxJOdWGhRq/tRL I78zwDvkqieH6YnhKoxp8oRhNmeaws72CfdWsqKxxJrVamPO1w15M630gMJJCXzpekuX gY4RP0rERGETBGXx9FmZqTDkEbD/NqxV9LbjbQzLdjtzJwNhxdeiOQF0fS9RT1FBB9kJ B3LmE3We9Wg1DFz7Qi1ldHddcw+f+P3f4uXdDReMcawBOdifayPiS/dMG2Blvv2UmST8 S0ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QzlDsQONmLEKuCM6RMBYCmP6K47406rcRFrwfkpDmdI=; b=tF0JVJDyrEdFKzQdsYN1ZmM4yGc02YhOaanzRTD+Mbp+PwPaLxCJkNhhQFDqKmolf+ voMJriV4jthw7LzthnC+f/ju8cYSB9ptjbGtyHqII0+mz3Rizw96v9FkXOQ80YPzCPjP jf7B2BuY5f+m6szf6wCnUpzv0vlzYQEGz24rEWWdeRYfhPpt37NoSHsbDWxuyvTg+sTg K5Iz1mOh87YPq23ILkFohYDURlqGJOJcX176AUkzOHQg2MVO9mDhv2QxB+S/M+g6/lps lwUkAeN5SFKoNycHYXitTdUbd6kx+l31+pN7aTN0uVuANfJoJlviCTGKDGjumhs+gXBW /IJQ== X-Gm-Message-State: AOAM531+WtWnV11+83e9LAM/Ho8bN8d6w39RRj2AVZNmaqds4z3R1JlQ trx3LCpp2zehdi/gog1fvcrcnmHI X-Google-Smtp-Source: ABdhPJyMFvKH3oTeCPilPfF9VFOFtkbjm7N9uuYgG2BbofP+MjyrUABy444Udfr61/oemLdlXd7TFA== X-Received: by 2002:a1c:80d0:: with SMTP id b199mr14663359wmd.93.1589735871316; Sun, 17 May 2020 10:17:51 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:50 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:08 +0200 Message-Id: <20200517171725.732-11-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (OPENPGP_SIGNING_KEY_URL): Add new variable. (chk_gpg_keyring): Use it here. --- etc/guix-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d2e44e98b2..043357d9c4 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -59,6 +59,7 @@ INF="[ INFO ] " DEBUG=0 GNU_URL="https://ftp.gnu.org/gnu/guix/" OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5" +OPENPGP_SIGNING_KEY_URL="https://sv.gnu.org/people/viewgpg.php?user_id=15145" # This script needs to know where root's home directory is. However, we # cannot simply use the HOME environment variable, since there is no guarantee @@ -112,7 +113,7 @@ chk_gpg_keyring() # systems where gpg has never been used, causing errors and confusion. gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || { _err "${ERR}Missing OpenPGP public key. Fetch it with this command:"; - echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -"; + echo " wget ${OPENPGP_SIGNING_KEY_URL} -qO - | gpg --import -"; exit 1; } }