From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#33134] [PATCH 5/5] guix-install.sh: Update sys_authorize_build_farms. Resent-Message-ID: From: rsiddharth Date: Fri, 2 Nov 2018 21:11:38 -0400 Message-Id: <20181103011138.66825-1-s@ricketyspace.net> In-Reply-To: <20181024115443.GA1297@macbook41> References: <20181024115443.GA1297@macbook41> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33134@debbugs.gnu.org Cc: rsiddharth * 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 } -- 2.19.1