From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id XlKWJXzymWNmcQAAbAwnHQ (envelope-from ) for ; Wed, 14 Dec 2022 16:57:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aNCxJHzymWNsUQEA9RJhRA (envelope-from ) for ; Wed, 14 Dec 2022 16:57:48 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3C84D2904C for ; Wed, 14 Dec 2022 16:57:48 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5U85-0001Au-3R; Wed, 14 Dec 2022 10:57:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5U7z-00018w-N2 for guix-patches@gnu.org; Wed, 14 Dec 2022 10:57:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5U7z-0006Dn-5O for guix-patches@gnu.org; Wed, 14 Dec 2022 10:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5U7z-0004bI-1L for guix-patches@gnu.org; Wed, 14 Dec 2022 10:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60069] [PATCH 2/2] guix-install.sh: Directly exit in case of errors in chk_require. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 15:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60069@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167103338417657 (code B ref -1); Wed, 14 Dec 2022 15:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Dec 2022 15:56:24 +0000 Received: from localhost ([127.0.0.1]:40036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5U7M-0004aj-AT for submit@debbugs.gnu.org; Wed, 14 Dec 2022 10:56:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:40692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5U7J-0004aW-4J for submit@debbugs.gnu.org; Wed, 14 Dec 2022 10:56:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5U7I-0000Pw-Rg for guix-patches@gnu.org; Wed, 14 Dec 2022 10:56:20 -0500 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5U7H-0005aw-9d for guix-patches@gnu.org; Wed, 14 Dec 2022 10:56:20 -0500 Received: by mail-qt1-x82b.google.com with SMTP id fz10so2800590qtb.3 for ; Wed, 14 Dec 2022 07:56:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r1e7GD9O2+hfD7OLoW8NerYiWInDFB5EbjU5xiHA/w8=; b=eAC9CsjU+4SXqay2a+y8/ziKameiGIy9B/Pb3DS5yQ0C9ITog4Ofi1DAfPzaAL1hyC iKlc47IkQWjFlxU6BMJ0iF+GOjau7M2enEMXodXe3ldRUvvqY7otH5RYIfiLc1M+EVwl MN692sw0Ecw8wn6hT4mFUwSaGJQz36XOiyZ7dlL1d6LaYlrh7cV/p+ChkHxBPsHIZ1t5 sGGVDAz9JqVTt8Z0so4vYTmpTWggmvRHATjrynxwHE44CkX7X1onXfhev+8mq9XyeRS9 9LZZfL1Gm3uhAZkeY8WwkBSXcdI7xRnDxaayZPuCSB7fazeNaz3I1FS63/n3/1wCYs5r lDjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r1e7GD9O2+hfD7OLoW8NerYiWInDFB5EbjU5xiHA/w8=; b=VT2q7/qHdnpqjy0Ya67wYq1LH6pbrteDyxzScIh4HrLIn+LGrCtWR2IE616+3+6/PP z7Qk45RYK+0PIvEBmOFiXi7uMcIAgyOquohFU5dY8XJglUO9USz1khG3URgDnHemcF9v o9ocUzN8jVUl05JJuqLUt8mwr9WKCUcaM29KnPc35o5c5j6a9taXJ45XfctsWZlTq3xM f/oPIDqwguMuDw593RyLhN45jyqWbe9RTHz5H3d+dX9CD0HAcZsEzEi3Fn2ZJ+QkKBal jqSZcrdvZs8hLSo03ijTuK8llJvDAwKhQwQQ4VRnNdyc5PX3q6c5245dmn9oFfpwPN5P evvQ== X-Gm-Message-State: ANoB5plhXiAdZ+MWk3YlL3sEmtka8gLo821Z3kb63AmIKVUQVihUC8m7 vfc3fMhUhEkkLRVTDWVe6yWyJqEPvQWiAA== X-Google-Smtp-Source: AA0mqf6uRwO1InbTRP97WvgEsbf2Iecwrno9NYY/R+nGTX9CFEQ6eaqzt0Q41E+yWV26BZjebSz1Rw== X-Received: by 2002:ac8:545a:0:b0:3a8:649:8d0a with SMTP id d26-20020ac8545a000000b003a806498d0amr27485103qtq.30.1671033378078; Wed, 14 Dec 2022 07:56:18 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id k10-20020ac8074a000000b00397b1c60780sm1829150qth.61.2022.12.14.07.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 07:56:17 -0800 (PST) From: Maxim Cournoyer Date: Wed, 14 Dec 2022 10:56:03 -0500 Message-Id: <20221214155603.29381-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214155603.29381-1-maxim.cournoyer@gmail.com> References: <20221214155603.29381-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671033468; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=r1e7GD9O2+hfD7OLoW8NerYiWInDFB5EbjU5xiHA/w8=; b=fQBpMvQxMC8GhDgPVJMtOXrdFCTepIs54o5iGpGtEKqX34I4KmKVm36McKx9dHAuD6yrnD RCCDA5toibv5mG7E7WZINQdNdwXDiVzdO8UXBPfGisXBq275LgqqHVlXiVO0lCYpIkM6yo sObHGFrknBvp+dfRq4VzXUgNCabhMoFDkhR2JdJiLZ288tQI1huXxln/CxDAxvIDpfDDIx Pybei6mk8upm4EQaZRuayShadSvIYdv9WvDKkAFdrn2EEMVnLPyV+axIHg7f2V17/h8R6+ V6mcwRATvBEAINTYIokt4A8yfcdV7DD9FyI0oYRiiE1iLXvy8vsxXGgx0bgJbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=eAC9CsjU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671033468; a=rsa-sha256; cv=none; b=q2DS7XHhR65H6F4baG86fD19IPKdix+f7ABFwCjKifr3GzkrTIUV8AH8UTD483ELRQoJus Kflq6kmtHXQfEdJvgKuWUhFvPpWg9SPnrGDZx5Y/7Bnsnk4yrIEVB97NJSbF+L5rAs6rNK yPpQAicA1U+Um3tjT3FUOGChJj+sK9f0k7j0+EW1ruxP4C8o4owdZo+6jwjN7zfcDFejjr +hYKGNr8mc5OnhJZR1fxicSVF+Iudw90/DwjY8kycPQe4RAYOC/5TTk2xoWMH4VlsVt2Dd 0R0P73mqSh4nw4un0amugQs4ncdOHAZMtDP2v87QYGqZckiv2zsZByXY40RCzQ== X-Migadu-Spam-Score: 5.23 X-Spam-Score: 5.23 X-Migadu-Queue-Id: 3C84D2904C X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=eAC9CsjU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: Bgh8RvGbC1Im * etc/guix-install.sh (chk_require): Directly exit in case of errors in chk_require, instead of relying on 'set -e'. --- etc/guix-install.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 06730f7e3f..0ca12f8b66 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -137,10 +137,8 @@ chk_require() command -v "$c" &>/dev/null || warn+=("$c") done - [ "${#warn}" -ne 0 ] && - { _err "${ERR}Missing commands: ${warn[*]}."; - return 1; } - + [ "${#warn}" -ne 0 ] && die "Missing commands: ${warn[*]}." + _msg "${PAS}verification of required commands completed" } -- 2.38.1