From patchwork Thu Dec 19 07:17:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35035 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 08C5127BBE2; Thu, 19 Dec 2024 07:21:03 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 B0EFE27BBE9 for ; Thu, 19 Dec 2024 07:21:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOApN-0004bG-BZ; Thu, 19 Dec 2024 02:20: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 1tOApJ-0004Xe-AV for guix-patches@gnu.org; Thu, 19 Dec 2024 02:20:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOApJ-00021V-0i for guix-patches@gnu.org; Thu, 19 Dec 2024 02:20:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=de94PPeOgiMMef9HvPbGamBHofxuLfh2XkrwwTFee24=; b=MsS3UdKKH2gbgrp7v3SLmvOK6O7mDpxDFNXLUb8zjOtS2IaeItNdGzeigD4NSitvyX0JGfaRgvRSwpYbkvKyz75iMNKnj0vh1IyRNf7Sr8vVS+Xl6kFH0EoeRGkBtJceU+pkqiY9ZN44uBqZ4icElC0AX6QYdTwS2Pvpg8LOjUXeMfqbZrY2jtXFLSoDGiXCtwY0BpMSu0gW1od/YVHP/RDVSvDfzrVnV9OC+JgtxPbjJk3I/sPOLoyAec1cuPyzIWhqyVJfgg84pDRZloH/sJK65kg0qpazzwd6RHFrHx71n16O1L5wuqa95PAKKuqhVQetsQqtMVymnOGggi93yQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOApI-0006tl-Q2 for guix-patches@gnu.org; Thu, 19 Dec 2024 02:20:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH 1/3] etc/teams.scm: Add etc/guix-install.sh to installer team scope. References: <0e7da0b076ebc6a90ae1c8c2c760b89ad6dd1d5e.1734591473.git.maxim.cournoyer@gmail.com> In-Reply-To: <0e7da0b076ebc6a90ae1c8c2c760b89ad6dd1d5e.1734591473.git.maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 07:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74962@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 74962-submit@debbugs.gnu.org id=B74962.173459277226381 (code B ref 74962); Thu, 19 Dec 2024 07:20:04 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:19:32 +0000 Received: from localhost ([127.0.0.1]:37217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOAol-0006rQ-V0 for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:19:32 -0500 Received: from mail-pj1-f43.google.com ([209.85.216.43]:48185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOAoj-0006rH-L1 for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:19:30 -0500 Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2ef760a1001so398909a91.0 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:19:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734592708; x=1735197508; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=de94PPeOgiMMef9HvPbGamBHofxuLfh2XkrwwTFee24=; b=h1pu/+JyOSXbH8D1l0AqoW0O40DngyMeGa9u1UPK+juryrrY4hku1ZrkhnRzgC4sPq 4+f/99AJeJXI19tsAxu8ml62zChPGHp4bGqCvhK9CZHerQIgOsnfPjkw8KN20T+rO0QK QcTmQ3v/gxSHR5VDNwQG15TmvqBrL/FUB3tVR0uwzl3scjgxLo+6d+7znr3tBtPrpYB0 PO2IKZGFUIemAwbr5s0QGa4Keg8IRPTgRBDNvyctw0rb2DijvRICMyJ/BLzW5ZeWVCwe EmQpgPo8PiF4oLTmSnS7bD0g9vbLkpcrWoQ3UriGyINz54tQpUPLorRFu+ow64yHiGS/ 38Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734592708; x=1735197508; 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=de94PPeOgiMMef9HvPbGamBHofxuLfh2XkrwwTFee24=; b=gJtZcxKjgUmR253EfjHWgKNzRNPaH8FlKP3pzWEGWSdllZJT8lJMchcuQEsnT4rotE BgwvEyFCQAzduk9dBYuFNaPDRrqKdJUqdNU5qNxxEYIHfmWItxjkp75LIFNPq2H1l9O7 9iepuuoqPeVP1MbsAFRKQVBKfIEJcK2yAke4pow4vyC8oKQ3mg6JKI87WtB+Us1iUTip dz7KkKuu6ixw+Ujaao+ShJ763KIaeytG1tmxAQ7S3r17ebsQbBrWk09Y3nVas1v9vng6 V4BMTFBoYOSiRvB85JaZmjAysO9hsvC37AK7JRg2O3zbX3aedJL3iGoxPZ1+ZgtRmXW0 6I0Q== X-Gm-Message-State: AOJu0Yz1Hk3PCjzZ7jlpuXUMH3wwLkZI43uXSrZgxA3vbWDUJHkbbJpr b0olHDbJtGYcQjW0ndKz2Eep1Y+Z1NFW5KmS+Ten+KaIVFQ7DauSIP+Ak5b0Or8= X-Gm-Gg: ASbGnctpBrtuVqBgTCXn53391kfrKNh8c4uOd+00P4kXCU+dSGmM3n25qvFEQq1rxa2 kZK2VGmup9akGCtQjHp49szkoDDrf4O2fLz89TSuSeO3DFeYy4UpYdfKnHD+SOmMt6Fk00BN7uv 321Kv+tRjir1gzkOgcVAMcIAltoUhb38sEpWn5XyI7AKrEHjfmErWXnI5i2kHfGfK7+BlmKfqdi JfnvHu2zyPIzoadwYUCBtBRq6a/6dZESP/e7NGosb85xW3fTGMOQWDbfzWj1qIosUtumsfsvNU= X-Google-Smtp-Source: AGHT+IGhc4zc46pI46JSVJaqt4x3k3fTw6bTLLWBUovFCWwOJHycsxPxVTxBJLP7P2wYHBbeRxwM2A== X-Received: by 2002:a17:90b:1a88:b0:2ee:d024:e4fc with SMTP id 98e67ed59e1d1-2f2e936a09emr8733999a91.33.1734592707793; Wed, 18 Dec 2024 23:18:27 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed8304absm2833241a91.24.2024.12.18.23.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:18:27 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:17:50 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 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/teams.scm (installer) <#:scope>: Add "etc/guix-install.sh". Change-Id: I351476c3150c25c8d403e9a4ff0a05c98b9d1821 --- etc/teams.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: 17c0aa6192f6a90c227e92720f2d63240996d0d4 diff --git a/etc/teams.scm b/etc/teams.scm index 6b492f1d4b..fb6a30ed2f 100755 --- a/etc/teams.scm +++ b/etc/teams.scm @@ -10,7 +10,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022-2024 Ricardo Wurmus ;;; Copyright © 2022 Mathieu Othacehe -;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022 Simon Tournier ;;; ;;; This file is part of GNU Guix. @@ -523,7 +523,8 @@ (define-team translations (define-team installer (team 'installer #:name "Installer script and system installer" - #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)")))) + #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)") + "etc/guix-install.sh"))) (define-team home (team 'home From patchwork Thu Dec 19 07:17:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35036 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 1268827BBEA; Thu, 19 Dec 2024 07:21:04 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 8CD1A27BBE2 for ; Thu, 19 Dec 2024 07:21:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOApM-0004ad-6m; Thu, 19 Dec 2024 02:20:08 -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 1tOApK-0004YF-9c for guix-patches@gnu.org; Thu, 19 Dec 2024 02:20:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOApJ-00021g-Rv; Thu, 19 Dec 2024 02:20:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=g27M3iObPvhbrCTv91lyWvzbV6VPtZa19dTQmpnInAs=; b=Rqph1Xpn1eI5oW09Xlr5ruZ5ydFkYmdOfsJF5O1zOiz37r9iTCmZDXmUlkx0DjphOFQKgtB9cTvIMyc5YBVT8W/EKkHpSwOBOdTaKqVFA+rnlus7NJMmkiVQRSJ0XJElOdbMNktpycj03X4UWIEyphA5h9aa1asnp8t/1448n3V+8yTafMAXoqyxX0MBc5aZITdl9fkAbxFs5tdfueCnWYtOnJ7fWE1AX7ZSvN5r3XzuQdp4IwPf2oPmnSiErWEaXrVl8IFt/7GT09bDbdvR5TwwB72HGga4SFL38u4rPfYLaVsKGxnK74zVc3YO9MIzo7LCYpLyOQ7vUraAnShpCg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOApJ-0006tv-IS; Thu, 19 Dec 2024 02:20:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH 2/3] etc/guix-install.sh: Explicit shebang to use /usr/bin/env. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: janneke@gnu.org, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 07:20:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74962@debbugs.gnu.org Cc: Maxim Cournoyer , Janneke Nieuwenhuizen , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe X-Debbugs-Original-Xcc: Janneke Nieuwenhuizen , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe Received: via spool by 74962-submit@debbugs.gnu.org id=B74962.173459278426418 (code B ref 74962); Thu, 19 Dec 2024 07:20:05 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:19:44 +0000 Received: from localhost ([127.0.0.1]:37220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOAoy-0006rw-BI for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:19:44 -0500 Received: from mail-pj1-f42.google.com ([209.85.216.42]:52271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOAow-0006rc-Fe for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:19:43 -0500 Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2efded08c79so333040a91.0 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:19:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734592716; x=1735197516; darn=debbugs.gnu.org; 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=g27M3iObPvhbrCTv91lyWvzbV6VPtZa19dTQmpnInAs=; b=TukM3iDu77iUTIZMyyXpnmH7j/uAItgKW24nouq37sStnTbJ5E3UVd1guMxpItREN1 2t1rgj8ljuxUiZ/OgOzOSO6xDbUWutyCNMfD2LsdBfCU8ZKPvOBcvi44cNwaibTTTOcq Chyf1E12P/FyEFV/emnngy7Givr3tjy4+EYAkvgrRIOkQcl10M3THz7RdLWqe65x6coG 1rlvo419U6w+q0cQZpgiLc7kZ4vSMYpOfN+5l8ZGDnaPqHMsuNGWNdDCrKqqp1C6u98t IxFhyEd1E+m4ctzLjSK0Hup0zefgvsruEs80+FuX1jOt7vakrQ1TQg7SxNFqa6PKY1f2 0J4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734592716; x=1735197516; 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=g27M3iObPvhbrCTv91lyWvzbV6VPtZa19dTQmpnInAs=; b=fyY/z4Q8eoVeb8bjWPobbQ1HfF0lsmba0eizqNzTiUKJ7xOWedk9CqnTLQIevcTFix dmuprvX3WIyLeZK+YkT3r2wtLToFExNese9MCZ6vU7kLv4kpp91j+S8uAW0FtwSKpV+C N0eWePqqovg4hitye8lgC59xMV2wBJdo6bE9Vu7NlnELMU97SHrQBCJbRvqJ8T7LTlpp /SF7uwR9T21A3k0CpQ7CRCuaLSX+BPEXwiyouVYFKGDynPkaWYsWeFgYAME1/nO4WnSh XN5FC8YP9qFaGZmGw3dUhoAwjRaFZkAltlXmk1PWpI56yj9TBGwk+un8DGljO2Vplx5m 458A== X-Gm-Message-State: AOJu0Yx1T+WkWd0yIrXe28aUKGvOl+r1KCdnFdqAHc6XzgRZ5eSHpJs9 aT9TkOBLnr3S+zWT9hd9sn3ZuJs7DpYfGCwiq+R9fAcPOs0ED6tw9xdeF3wKJdA= X-Gm-Gg: ASbGncu3hu8vCucjfhzQJlBmdLVvsNdK+JiS1ANYdEg9QP8DL3SWn5oMVhkbozmCG/y XHsADGqKLNn5dWcM6fTeey9YoGlkZRfPQNrD8kMplyicS3QCdqnpcSn4YOAXZzc3qe8dtOunB+I r0hujA2hwzHdmsvG774gD2/25JWm5rw9jRetaKCM54gd2yzP9GSITy8WhIpRwJDfX1OzSgpt2Oy iVvgbqNes9MScL5p8uLNxBGzxnRipI1IfIOl9iYBpcd9NVU45BO27i7f0h0PXmYYhgpDAOWklE= X-Google-Smtp-Source: AGHT+IGIhOeGzGe4R70NRiimOBfbgieRxj7Fq4SiE3p1SIPxmJz9XRiVjQklpsGR5KZuNLbr2rZbUg== X-Received: by 2002:a17:90b:2d43:b0:2ee:b8ac:73b4 with SMTP id 98e67ed59e1d1-2f443d5725cmr3051609a91.36.1734592716381; Wed, 18 Dec 2024 23:18:36 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed8304absm2833241a91.24.2024.12.18.23.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:18:35 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:17:51 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 Having an explicit shebang tells something useful: we depend on Bash. Tools such as shellcheck make use of it. The original technical reason for avoiding /usr/bin/env is no more (Guix System lacking it). * etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' further block below. Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0 --- etc/guix-install.sh | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index f07b2741bb..481eb6f12a 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # GNU Guix --- Functional package management for GNU # Copyright © 2017 sharlatan # Copyright © 2018 Ricardo Wurmus @@ -9,7 +9,7 @@ # Copyright © 2020 Daniel Brooks # Copyright © 2021 Jakub Kądziołka # Copyright © 2021 Chris Marusich -# Copyright © 2021, 2022, 2023 Maxim Cournoyer +# Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer # Copyright © 2022 Prafulla Giri # Copyright © 2023 Andrew Tropin # Copyright © 2020 David A. Redick @@ -31,10 +31,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see . - -# 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 @@ -50,11 +48,6 @@ # installation required the user to extract Guix packs under /gnu to # satisfy its dependencies. -if [ "x$BASH_VERSION" = "x" ] -then - exec bash "$0" "$@" -fi - set -eo pipefail [ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; } From patchwork Thu Dec 19 07:17:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35034 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 A928827BBEA; Thu, 19 Dec 2024 07:20:57 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 2266F27BBE2 for ; Thu, 19 Dec 2024 07:20:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOApN-0004br-KS; Thu, 19 Dec 2024 02:20: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 1tOApK-0004Yb-Py for guix-patches@gnu.org; Thu, 19 Dec 2024 02:20:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOApK-000221-Gu; Thu, 19 Dec 2024 02:20:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=EVW8jbb9u5L41BdaLi+PKnhfahNg1LxL8P7iP7Kkj84=; b=OmrM0etQG91s11VP5ga2nFa7d9XOcF+tUpqAbf4dX37HJIIKw8kzSIhp21/ZuruMLIvMUtxza4UUFV413fcP87+lDSIs3+hF9ly3wKX+wSyFucvyFl+tX1+WNOZwPBsOKIr4k8U8pI59e5bcMaoWUPCTAE69BlZEQghVJJe1KfNoGp0GGCO/rEMh1mGcdvgyS2jDQBk7dlWQdxzz9sNy6uXRvEgODGG0RxXWJkvNFJziWe5L+kiR11CEZaJP/yw6ZrbR/RsV0UIj7cJomGr0wwYl8rKXW/NC2Yb7cjXR870ZS5tsrWbTItggxq4sqscs+tupH51blKjG9nJbWemaWQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOApK-0006u4-9m; Thu, 19 Dec 2024 02:20:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH 3/3] etc/guix-install.sh: Fix quoting and other issues. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: janneke@gnu.org, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 07:20:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74962@debbugs.gnu.org Cc: Maxim Cournoyer , Janneke Nieuwenhuizen , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe X-Debbugs-Original-Xcc: Janneke Nieuwenhuizen , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe Received: via spool by 74962-submit@debbugs.gnu.org id=B74962.173459279026433 (code B ref 74962); Thu, 19 Dec 2024 07:20:06 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:19:50 +0000 Received: from localhost ([127.0.0.1]:37223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOAp3-0006sG-TE for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:19:50 -0500 Received: from mail-pg1-f175.google.com ([209.85.215.175]:56619) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOAoy-0006rj-A6 for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:19:44 -0500 Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-801986033f9so234609a12.1 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:19:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734592718; x=1735197518; darn=debbugs.gnu.org; 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=EVW8jbb9u5L41BdaLi+PKnhfahNg1LxL8P7iP7Kkj84=; b=Qu72SP486PJO67woubxRJx5V4ox83T0B6+QF6aTKqSwyKMLydT7IJJhPgpBpjJxQUd wKE9DWiPZkzKw/9Qywn5C+z6q1W4/f9VP1p9VjTv/nO2c2TuGj9bAhe7/hkY78J7WTtb UCq8mRTedZzwXMbI3+HQRtdaLnaheTbJEOpnXqh2O61NCSG/LCE59L4wsId7g0zAVe+T DidyfQwKzz/PW3tAWXIz0xesXjifGDmkoD68R6KUZ1flA6av7Yn80B/Pg3tBdNV51wLH OHos8WWoVMJ9ZTBjk/7SZOousbtfN7X4xWfezqPiwRynBM2Hda+5gVEpIIw6uMeEqHV3 lQig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734592718; x=1735197518; 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=EVW8jbb9u5L41BdaLi+PKnhfahNg1LxL8P7iP7Kkj84=; b=ra7+j2rtL0itOqyMZ/nRW31PX9Th6141z+TbxJFa6YzgSyH0rEvuPO11ZbtkDJEuiW WvfFRJoUaty5m6DMF1E4IRF0ZPxlONwJpmofHws+eZS1UYZib1fQQc1S0drJEEJhrjsF Bs1m6ZBdejn0CN+IAcLItlpxAE+qiLugmFyjBs2hot4f5SOUV9QI+3ON27wrzEadcGLa tpNTPFvKwPl1r4Xboe0n5KjmZFYjNvOUYRb9A33nt1JMDU2ehDIIBDRsbluuI2RuFWKI 8viQ4J33gRtWIRsVC+yJvGx6sWOKqWT9BNWqbS9ertFksR/gd7PdyGq8y1zLH1W7e0pA gTrQ== X-Gm-Message-State: AOJu0Yy1LYQK8Mw6fYMBMPD+i+Htvk5yUwEqcJm0r9GEx//enfyIVFtV Bzf58cvtU/N9h7EqwNT6MaygTyVxGEKwd94vzDTQTY4q5wyOWeto3JHErHpMxKw= X-Gm-Gg: ASbGncv5NMyL3IINga9be+j7wVvKBwSxWyUXQqcu/ZCOuYYnnX8Yqobj09sYczvAAK6 /UXebCNfRYheZnMBnu7v9UnU2khYTxhEPHkeoLzjUNu9KnqY5dkXBXwM60VFyf/VuwUVxMK28V1 UckBySnWeCU2qwOE8bBmUyhyBpcz7jRlwLFbk7KmcrlN8CcSdLk60JwY/dQyrIL5e0NzNGzXC9r wgif4lm3wJ3O4ST1phGZ9JJ0xaVelM8Vw2XutsfT73f8zvLV9Zv7B23DDalaKUHR6bl9R5xuCk= X-Google-Smtp-Source: AGHT+IFkVLbnZzePwr5CuTueTqr+1vP7tjpHYyGWK/XOVrsEQMgxOd7ZAwgSgDXz1mgegwUc2D1Now== X-Received: by 2002:a17:90b:5484:b0:2ea:853b:2761 with SMTP id 98e67ed59e1d1-2f2e93865f6mr8941972a91.37.1734592718135; Wed, 18 Dec 2024 23:18:38 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed8304absm2833241a91.24.2024.12.18.23.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:18:37 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:17:52 +0900 Message-ID: <6b04713cc24b58ab4bbf4ac4060e4d57f7c8e1b3.1734592672.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 This change fixes most issues reported by the 'shellcheck' command. * etc/guix-install.sh (add_init_sys_require): Use -n instead of ! -z. (sys_create_build_user): Quote variable expansion. (sys_delete_build_user): Likewise. (sys_create_shell_completion): Likewise. (sys_delete_user_profiles): Likewise. (main): Replace $@ with $* inside string. Change-Id: Ia88509b461b3844f2dd5abf9fb21a5b2bbb8a1e1 --- etc/guix-install.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 481eb6f12a..2ab443d97b 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -151,7 +151,7 @@ chk_require() add_init_sys_require() { # Add the elements of FOO_INIT_SYS to REQUIRE local init_require="${INIT_SYS}_REQUIRE[@]" - if [[ ! -z "$init_require" ]]; then + if [[ -n "$init_require" ]]; then # Have to add piecemeal because ${!foo[@]} performs direct array key # expansion, not indirect plain array expansion. for r in "${!init_require}"; do @@ -427,12 +427,12 @@ sys_create_build_user() for i in $(seq -w 1 10); do if id "guixbuilder${i}" &>/dev/null; then _msg "${INF}user is already in the system, reset" - usermod -g guixbuild -G guixbuild${KVMGROUP} \ + usermod -g guixbuild -G "guixbuild${KVMGROUP}" \ -d /var/empty -s "$(which nologin)" \ -c "Guix build user $i" \ "guixbuilder${i}"; else - useradd -g guixbuild -G guixbuild${KVMGROUP} \ + useradd -g guixbuild -G "guixbuild${KVMGROUP}" \ -d /var/empty -s "$(which nologin)" \ -c "Guix build user $i" --system \ "guixbuilder${i}"; @@ -445,7 +445,7 @@ sys_delete_build_user() { for i in $(seq -w 1 10); do if id -u "guixbuilder${i}" &>/dev/null; then - userdel -f guixbuilder${i} + userdel -f "guixbuilder${i}" fi done @@ -681,7 +681,7 @@ sys_create_shell_completion() { # Just in case for dir_shell in $bash_completion $zsh_completion $fish_completion; do - [ -d "$dir_shell" ] || mkdir -p $dir_shell + [ -d "$dir_shell" ] || mkdir -p "$dir_shell" done; ln -sf ${var_guix}/etc/bash_completion.d/* "$bash_completion"; @@ -747,10 +747,10 @@ sys_delete_user_profiles() rm -rf ~root/.cache/guix _msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all /home users" - for user in `ls -1 /home`; do - rm -f /home/$user/.guix-profile - rm -rf /home/$user/.cache/guix - rm -rf /home/$user/.config/guix + for user in /home/*; do + rm -f "/home/$user/.guix-profile" + rm -rf "/home/$user/.cache/guix" + rm -rf "/home/$user/.config/guix" done } @@ -898,7 +898,7 @@ main() if [ '--uninstall' = "${uninstall_flag}" ]; then main_uninstall else - echo "unsupported parameters: $@" + echo "unsupported parameters: $*" exit 1 fi fi