From patchwork Sat Nov 3 01:11:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rsiddharth X-Patchwork-Id: 82 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 5866E16798; Sat, 3 Nov 2018 01:12:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 5836C16794 for ; Sat, 3 Nov 2018 01:12:37 +0000 (GMT) Received: from localhost ([::1]:53864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIkUO-0008NW-Lo for patchwork@mira.cbaines.net; Fri, 02 Nov 2018 21:12:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIkUE-0008FC-JN for guix-patches@gnu.org; Fri, 02 Nov 2018 21:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIkTx-0006TE-MD for guix-patches@gnu.org; Fri, 02 Nov 2018 21:12:15 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIkTr-0006PH-C8 for guix-patches@gnu.org; Fri, 02 Nov 2018 21:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gIkTr-0002lI-6L for guix-patches@gnu.org; Fri, 02 Nov 2018 21:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33134] [PATCH 5/5] guix-install.sh: Update sys_authorize_build_farms. Resent-From: rsiddharth Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Nov 2018 01:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33134@debbugs.gnu.org Received: via spool by 33134-submit@debbugs.gnu.org id=B33134.154120750410577 (code B ref 33134); Sat, 03 Nov 2018 01:12:03 +0000 Received: (at 33134) by debbugs.gnu.org; 3 Nov 2018 01:11:44 +0000 Received: from localhost ([127.0.0.1]:60496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gIkTX-0002kX-L0 for submit@debbugs.gnu.org; Fri, 02 Nov 2018 21:11:43 -0400 Received: from lyra.ricketyspace.net ([159.89.229.91]:36078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gIkTW-0002kP-1y for 33134@debbugs.gnu.org; Fri, 02 Nov 2018 21:11:42 -0400 From: rsiddharth DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ricketyspace.net; s=mail; t=1541207501; bh=iN648lBwsWcHEARR7sbf/ZsnBDcV7NH7UsF26/l5M08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=3tWM9tZuuRNKUHVGr3UBKalQuymo3AUzM7gk1qtcaKD9ZCiLpGrb24paUcr22i36/ imoN6e602SQ6CEgWS7c6nrYM5orlt1mknNN6WOAwOkhZuzugLe+dz7wp6xjJJBIqW8 sUYxW7ty6JWA/9EAcHopAgzSJe+r0D7Bl8w7Oa1/VsihaVfpxZHxDtuqfJYFzJsd6G hS/b8DFNeMpj80tXj8iDdt70s8VmmmH1vD4do78bALCMPhi+b6pjWy8dYEV3hHZsBW 6pSfqgafvdgE/gRoPtaUwmfozbI0C4as6SuXh58K1CUsTC2ueKziTlhAhQv38XB9y/ k1NbAsfOW5Zlw== Date: Fri, 2 Nov 2018 21:11:38 -0400 Message-Id: <20181103011138.66825-1-s@ricketyspace.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181024115443.GA1297@macbook41> References: <20181024115443.GA1297@macbook41> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rsiddharth Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (sys_authorize_build_farms): Don't prompt if AUTO_YN is set. --- etc/guix-install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 9bf52db41..18adc17a2 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -355,8 +355,11 @@ sys_enable_guix_daemon() sys_authorize_build_farms() { # authorize the public keys of the two build farms + local yn=$AUTO_YN + while true; do - read -p "Permit downloading pre-built package binaries from the project's build farms? (yes/no) " yn + [[ -n $yn ]] || read -p "Permit downloading pre-built package binaries from the project's build farms? (yes/no) " yn + case $yn in [Yy]*) guix archive --authorize < "${ROOT_HOME}/.guix-profile/share/guix/hydra.gnu.org.pub" && _msg "${PAS}Authorized public key for hydra.gnu.org"; @@ -365,7 +368,7 @@ sys_authorize_build_farms() break;; [Nn]*) _msg "${INF}Skipped authorizing build farm public keys" break;; - *) _msg "Please answer yes or no."; + *) _msg "Please answer yes or no."; yn="" esac done }