From patchwork Wed Dec 14 20:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45325 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 7FCC127BBED; Wed, 14 Dec 2022 20:47:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CF6627BBE9 for ; Wed, 14 Dec 2022 20:47:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Yee-0005Kj-4m; Wed, 14 Dec 2022 15:47:04 -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 1p5Yec-0005Jy-Ky for guix-patches@gnu.org; Wed, 14 Dec 2022 15:47:02 -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 1p5Yec-00016H-DL for guix-patches@gnu.org; Wed, 14 Dec 2022 15:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5Yeb-0004DF-Sw for guix-patches@gnu.org; Wed, 14 Dec 2022 15:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60068] [PATCH v2 1/3] guix-install.sh: Add missing "useradd" command. References: <20221214155603.29381-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221214155603.29381-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 20:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60068 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60068@debbugs.gnu.org Cc: me@tobias.gr, Maxim Cournoyer Received: via spool by 60068-submit@debbugs.gnu.org id=B60068.167105081716174 (code B ref 60068); Wed, 14 Dec 2022 20:47:01 +0000 Received: (at 60068) by debbugs.gnu.org; 14 Dec 2022 20:46:57 +0000 Received: from localhost ([127.0.0.1]:41784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YeW-0004Cn-Ph for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:46:56 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:35536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YeU-0004Cg-FI for 60068@debbugs.gnu.org; Wed, 14 Dec 2022 15:46:54 -0500 Received: by mail-qv1-f48.google.com with SMTP id i12so580233qvs.2 for <60068@debbugs.gnu.org>; Wed, 14 Dec 2022 12:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=s1S5diU0loMggoAHjZl0JwyWRf9X445sUSvA71M+bJE=; b=Ktp7ej3EuIc0YEgvKJA3EBwpUsaS/B9swHXFzYIDjiNoYQ3k1tHxMxa9xUX1LARRlL mrPe7wOFZ+sq89bukGX36SaqyM7MKNNn7j9iDkISxiCm/W2bihqyzB2o7cNrmJ0DoOnT zmKW66Qi/rzs7Ph+wlNBcN07n4e7bkyjoQgZ2pbYICUs6lzlCfmvXHtqLSFDw04vmAd6 nokyWtB/d9NgQy8y1/8kM2Z5znZm4d40hgJG+q2bA/2DADDiSfyi6iwMp+snJxDP+8g3 ogsIhXTWxSOLSiaiDLmWDvHjj6pwZkyV9CZnuxk5uaeN0yK0391UzuTAZ0vbXYwWrmvn wFBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=s1S5diU0loMggoAHjZl0JwyWRf9X445sUSvA71M+bJE=; b=Gov9wjSPlC64gcWKMK+OfxcCruBcSAHgd7im6e/JBP2com6gT9726U4kZ35Yykx+fy IvAoOgC6VuULWnNdJ7N/+KYkrQbi1mCrQp5SWdw9L2AuroiqVi3JPmIqA1k8mMGaboAH FBeJ/04WoU+XtjQ9d0HMHkwpNaTIGNDZn47Zv+KHNwckgw6El7lLEhW8Wkb9pvyJLH8K LnIqgt3UokekUSFLChdP5Oy79GDtodhdJ6c01kYbF0TfvvXMSjMtzi+gB73jVPL85N1f WZRSppHtqtmucp+3+RUNZNI6H/l6vIJVJeyBCHz1WmPasQJFgaTaSKhaFuH2p2G1rpLV g+TQ== X-Gm-Message-State: ANoB5pnOVptg8bR7XXQzfvRnAu13psziZzD3WQNWoHa3qOENg+x3k+39 1JaY25HddaLK6T3MdW6OXZmYS+r+GA5wyw== X-Google-Smtp-Source: AA0mqf518wTVFsEkVgQFLv2qprarSxwVXtt+2NNGPeaY0Kw7nokfjB0VKrrp694LgPpuMXUpv/SRIg== X-Received: by 2002:a05:6214:3607:b0:4c7:6938:329d with SMTP id nv7-20020a056214360700b004c76938329dmr38867703qvb.0.1671050808689; Wed, 14 Dec 2022 12:46:48 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id p13-20020a05620a112d00b006f87d28ea3asm10192676qkk.54.2022.12.14.12.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:46:48 -0800 (PST) From: Maxim Cournoyer Date: Wed, 14 Dec 2022 15:46:38 -0500 Message-Id: <20221214204640.16879-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh: (REQUIRE): Add missing "useradd" command. --- etc/guix-install.sh | 1 + 1 file changed, 1 insertion(+) base-commit: fa23fb86f7741570d194bba1f227016d9aa25881 diff --git a/etc/guix-install.sh b/etc/guix-install.sh index f008593d84..b8ea9e54c3 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -53,6 +53,7 @@ REQUIRE=( "chmod" "uname" "groupadd" + "useradd" "tail" "tr" "xz" From patchwork Wed Dec 14 20:46:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45326 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 8F93727BBED; Wed, 14 Dec 2022 20:47:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0D98627BBE9 for ; Wed, 14 Dec 2022 20:47:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Yee-0005Kn-CR; Wed, 14 Dec 2022 15:47:04 -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 1p5Yec-0005K0-PL for guix-patches@gnu.org; Wed, 14 Dec 2022 15:47:02 -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 1p5Yec-00016M-Hd for guix-patches@gnu.org; Wed, 14 Dec 2022 15:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5Yec-0004DM-Cn for guix-patches@gnu.org; Wed, 14 Dec 2022 15:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60068] [PATCH v2 2/3] guix-install.sh: Add GUIX_ALLOW_OVERWRITE environment variable. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 20:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60068 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60068@debbugs.gnu.org Cc: me@tobias.gr, Maxim Cournoyer Received: via spool by 60068-submit@debbugs.gnu.org id=B60068.167105082116191 (code B ref 60068); Wed, 14 Dec 2022 20:47:02 +0000 Received: (at 60068) by debbugs.gnu.org; 14 Dec 2022 20:47:01 +0000 Received: from localhost ([127.0.0.1]:41787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Yeb-0004D0-0m for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:47:01 -0500 Received: from mail-vk1-f176.google.com ([209.85.221.176]:36773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YeZ-0004Ch-3b for 60068@debbugs.gnu.org; Wed, 14 Dec 2022 15:46:59 -0500 Received: by mail-vk1-f176.google.com with SMTP id l17so3761570vkk.3 for <60068@debbugs.gnu.org>; Wed, 14 Dec 2022 12:46:59 -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=Un0fZJVaLUxbKw8DTSotXo0HP/nDyh/LNRYFXBJIEhQ=; b=nJdd2Va10Aqw8PFd4EDn+eRpXEogj3qc7PtRYVR/WW8EkOd4qxex3yv9uORuMCKOnm pJ9o9LKx/bIkh40JnDp2kj+Kp0Qe+BJRDmOqtG/eXb7xxn4Bu5pf0QxjzcpcJ8lulOpD znDH2ytGXlyuIACV6yDAFW/4gqjQR7nDvR0Po5qnXHPLjxZAG6DOLlTi7RhLQS5P7jMl Dly82des+YGIbreRqKt3pkTT5ByF4u3vW1qjQ3qrk/GZ6+K+qlQjf0rfCXjo/YJy3Z6k eajfddUTTnZeNpFxnN/4zmx8S9jHLbN1Md5qJ7wT0+D+TRn7asnnfIl3H7bdkBEk0buQ R36w== 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=Un0fZJVaLUxbKw8DTSotXo0HP/nDyh/LNRYFXBJIEhQ=; b=r+tJFgu9xzwVWRdnjYJP6JEDpQnl/odkHs+mf4rXWsp4LDO63GSbA4qCiIj5cS+MzJ d7JHpVkLSFHt847KTbfbkhaRFNioslFsANRht99Dmo0l0uCuv+PKzOnvADvZ2pD1sYNS 72YuiyumXwQ6Wr0AZLQ8Wc+mJci1nsGcxRQLpbCHzPn+f0EYCaek3jBTI1O2D/PR8IEJ h0yBB4PGzlczsl4SXiauuMj7xklw3mgloUPZl7/p3e5kjVd5K07oPIkKQ01cfTdFvkrn joZPZtRU6W1jTxc3k1PXepn0+RsEc7l4ipid3r5/55/RuAQjEwan1VHhILoiT7yWL7Sl ibiw== X-Gm-Message-State: ANoB5pn2qWIauvuAP6P7zb6V5At+eByVSSnX/qZbkwEKjM79ZttpCosA 9BnmsLP39dBr79ymFZ9m6QwTVR/fud60RQ== X-Google-Smtp-Source: AA0mqf51yW3eD6cDdoCOl1Nxef/3Y2DkEoLy7sKOAWtlJ8zH8oTMKBi+S86IRDFloZBDC+4ZaXHRiw== X-Received: by 2002:a1f:ea42:0:b0:3bd:fb7f:e385 with SMTP id i63-20020a1fea42000000b003bdfb7fe385mr13349086vkh.8.1671050813270; Wed, 14 Dec 2022 12:46:53 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id p13-20020a05620a112d00b006f87d28ea3asm10192676qkk.54.2022.12.14.12.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:46:52 -0800 (PST) From: Maxim Cournoyer Date: Wed, 14 Dec 2022 15:46:39 -0500 Message-Id: <20221214204640.16879-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214204640.16879-1-maxim.cournoyer@gmail.com> References: <20221214204640.16879-1-maxim.cournoyer@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The need for this use case appeared when attempting to install Guix on a truly minimal image made with Buildroot, which lacked enough GNU components that I had to extract a guix pack to /gnu before attempting installation, which would then refuse to proceed because of the existing /gnu. * etc/guix-install.sh: Document environment variables. (sys_create_store) [GUIX_ALLOW_OVERWRITE]: Skip pre-existing installation checks and output a warning. Extract the tarball directly to /. --- etc/guix-install.sh | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b8ea9e54c3..62d85e765a 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -29,6 +29,22 @@ # We require Bash but for portability we'd rather not use /bin/bash or # /usr/bin/env in the shebang, hence this hack. + +# Environment variables +# +# GUIX_BINARY_FILE_NAME +# +# Can be used to override the automatic download mechanism and point +# to a local Guix binary archive filename like +# "/tmp/guix-binary-1.4.0rc2.armhf-linux.tar.xz" +# +# GUIX_ALLOW_OVERWRITE +# +# Instead of aborting to avoid overwriting a previous installations, +# allow copying over /var/guix or /gnu. This can be useful when the +# installation required the user to extract Guix packs under /gnu to +# satisfy its dependencies. + if [ "x$BASH_VERSION" = "x" ] then exec bash "$0" "$@" @@ -338,16 +354,15 @@ sys_create_store() _debug "--- [ ${FUNCNAME[0]} ] ---" - if [[ -e "/var/guix" || -e "/gnu" ]]; then + if [[ -z $GUIX_ALLOW_OVERWRITE && (-e /var/guix || -e /gnu) ]]; then die "A previous Guix installation was found. Refusing to overwrite." + else + _msg "${WAR}Overwriting existing installation!" fi cd "$tmp_path" - tar --extract --file "$pkg" && _msg "${PAS}unpacked archive" - _msg "${INF}Installing /var/guix and /gnu..." - mv "${tmp_path}/var/guix" /var/ - mv "${tmp_path}/gnu" / + tar --extract --file "$pkg" -C / _msg "${INF}Linking the root user's profile" mkdir -p ~root/.config/guix From patchwork Wed Dec 14 20:46:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45327 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 99D6527BBED; Wed, 14 Dec 2022 20:48:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F83A27BBE9 for ; Wed, 14 Dec 2022 20:48:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Yfc-0005ZT-Ta; Wed, 14 Dec 2022 15:48:04 -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 1p5Yfa-0005YZ-2Z for guix-patches@gnu.org; Wed, 14 Dec 2022 15:48:02 -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 1p5YfZ-0001Cl-Qp for guix-patches@gnu.org; Wed, 14 Dec 2022 15:48:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5YfZ-0004Ea-MT for guix-patches@gnu.org; Wed, 14 Dec 2022 15:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60068] [PATCH v2 3/3] 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 20:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60068 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60068@debbugs.gnu.org Cc: me@tobias.gr, Maxim Cournoyer Received: via spool by 60068-submit@debbugs.gnu.org id=B60068.167105082516230 (code B ref 60068); Wed, 14 Dec 2022 20:48:01 +0000 Received: (at 60068) by debbugs.gnu.org; 14 Dec 2022 20:47:05 +0000 Received: from localhost ([127.0.0.1]:41792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Yef-0004Di-HT for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:47:05 -0500 Received: from mail-vk1-f175.google.com ([209.85.221.175]:43844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Yec-0004Co-0I for 60068@debbugs.gnu.org; Wed, 14 Dec 2022 15:47:02 -0500 Received: by mail-vk1-f175.google.com with SMTP id g137so3743227vke.10 for <60068@debbugs.gnu.org>; Wed, 14 Dec 2022 12:47:01 -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=45V4zygLPUbUUHmAG3m2+7+BRyv6ncJsMrXYIl7BXM4=; b=PZs+djoCMCmLZZb3IUHAwrIOdXIJ90y+uAWFfuuALzg3u6cwMORIY+pZIljB+Sid1q X9iN50cFHM6uWr84xtAOvGoQ8yynfGAIMHwvVDqNCC7Xwnu2ntgd+MAqJCPVMdrZ4dHR rMI3IJJHSEJbIYrb3V9IDdFTcV7rvcWNV/OhVFeyp/+nhWte1Q37jNz0L93QylxuFiIo IENN457vX3ppzv7aXTnc1AXpnlTnvC9pVFg+Lpzj5naH7JIQxcEPBbVv/M1KW2v1P5d3 RuhKy+SVmtDhFoDuKm+hs8Vw5H1ekz2lqgr7HWfqD7XpRoWXMMmIMp2CSjXZbFmRFJOy XcJw== 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=45V4zygLPUbUUHmAG3m2+7+BRyv6ncJsMrXYIl7BXM4=; b=SGGRiTIUfhv2dNkaoGKG98EN63MfvCDlGwJJKdUPu4OnY/rX0q6nMEaRfcQfDAJOSJ EWe0WfS6kpyV5ugKoTv41vni/Sxr8c4opmMrtxj7hpENpVEJe+w1Ze62jWgMFZsMy6Wt 9fDWjDjav9fbRGXcJno6n2awZbUL6VQmdE1QhBWhvUhMwyORN1xXa2lWzlOZG1wGXGcZ jVNI/Qo0K1/SaS3rPCua3q6NKDgMWDx0uPOArAjMXog+InCnxbtARHMOFSSF+mMSESRw /vpchpo3sdxbmry35T9BiV2YMD4vKb2kg3ysy/3JuK7jYfhLfb6s9cJjrTk4j3ytTgn2 XkWA== X-Gm-Message-State: ANoB5pkO9zJgb3pp6EAEhMr0hR5OV1/l77futnIGBRxsNHY9QDDUlaYe OosSL8g8hxbX83azM6BtRFdCLBRsK+33XQ== X-Google-Smtp-Source: AA0mqf5GCbN7rsc4OPyW9+4Pj/cv8X8B8CyDk/CyDy5K2+CP5gQ/D0Q+OdF5+K9/wOgs9V/5qgnXfg== X-Received: by 2002:a1f:9f42:0:b0:3bc:d00d:82e6 with SMTP id i63-20020a1f9f42000000b003bcd00d82e6mr15732643vke.2.1671050816393; Wed, 14 Dec 2022 12:46:56 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id p13-20020a05620a112d00b006f87d28ea3asm10192676qkk.54.2022.12.14.12.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:46:56 -0800 (PST) From: Maxim Cournoyer Date: Wed, 14 Dec 2022 15:46:40 -0500 Message-Id: <20221214204640.16879-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214204640.16879-1-maxim.cournoyer@gmail.com> References: <20221214204640.16879-1-maxim.cournoyer@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 62d85e765a..ea10f35250 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" }