From patchwork Thu Dec 19 07:45:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35041 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 5BC3B27BBE2; Thu, 19 Dec 2024 07:48:45 +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 98D9C27BBEA for ; Thu, 19 Dec 2024 07:48:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOBGO-0002v6-TY; Thu, 19 Dec 2024 02: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 1tOBGO-0002ub-1C for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:04 -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 1tOBGN-0002kq-PI for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:03 -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=Z0Fwox8yUt+6WwvAGkybgM3h+UlFmFd1AmkKcCHw7fk=; b=FYGkKhYfe3LEnHb3xP40/tjY1maA/SHeV/Id689ekk95TUTKZGnI4MwUqFQC4LnYHFtRAzIE5rQalYDY5uMYHp5I8x5TlA6WQmfrjsmyQJKQPJva3VfzcFx/iEtFMyBUorZmzVQ+RiBz62fubLcJxdIVhjSyXt12WeB8dG4Kz/HxJdrVIm0lEdS5dQC8yRRHv50FEEd7XLrz1TYVJHjsdhAL0Lrt1ReHFiON5tOqQQ3PAraX/HbXpsGJrhzG77kDKvFryLIsHJxjiNykgTJ6DtT/6cBJ/Yw0ea03IrqQK5nO1ifxQnhjzbMOiBA+D9XP9brfN94efn6cI9HpiOHPXg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOBGN-0008Ia-BS for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH v3 1/5] 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:48:03 +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.173459444531793 (code B ref 74962); Thu, 19 Dec 2024 07:48:03 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:25 +0000 Received: from localhost ([127.0.0.1]:37284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFk-0008Gd-OE for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:25 -0500 Received: from mail-pj1-f44.google.com ([209.85.216.44]:56596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFh-0008G1-0w for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:21 -0500 Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2ee786b3277so309356a91.1 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734594374; x=1735199174; 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=Z0Fwox8yUt+6WwvAGkybgM3h+UlFmFd1AmkKcCHw7fk=; b=gw2///5ZLsLVe8mR1ffvWXRV314dLOVNxBxuhK3+1d1l72N14RE5lUoI4y2Txr+1gl WPOGT0ecxlhbvETzdQygzStpiX8Fgf5drACt2K6qrxgJEfTmXVPAGRDlhNRm2XGWxw37 X223ZJk7/FoOyRYHVcSckIc7FvImLpvhoKtGlhrK5ValcL2SSW9D/z77YmyTsZsnu4Xe svbTWbGdKrLSpBQLWhcamrhz7jZLR3Kmh5iE8aB3LdpKnEkujR4CqSmL7A5MQqKeL+v9 0G3B5wJW7LW4GFXH5pOxZEhNoXqfe9PgggMJe27VD2HTeesZHdIvrMP54UgtYGMiWtIH 7J6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734594374; x=1735199174; 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=Z0Fwox8yUt+6WwvAGkybgM3h+UlFmFd1AmkKcCHw7fk=; b=KjRdjd4uXuC2YcVDxLgKmW3vE4TGL42X3mKIePiBxZNL1k0jr1ZBRW/T64/C/1ZGIa xi48CzoSVv3jjvIGAByt/S5FYFcxe+UHRJl/sOdTuJUW/b8b1F4dlg6rRxPVof+SCFGb Ivvi4lJK2GZZTfkvDJsCWfJBDN+E3zsDBZUrdocRJWonsviGSL/nEsPw71xGLNFMOde3 Mu1T6/x/T9k+M0PZy4lYZpwH+AYY/FqxISlOB6RHs7J14UrdZVPrAZy29iMWLPunOamR LjmUihmQF3ID9lmVNFfkDB3fxSoo3VL9RzyE4j2oA3i2uEBFm+la/gjfsas8aGSwebiD Vt1Q== X-Gm-Message-State: AOJu0Yx6bqD/ecBn18MaGVrq55qunif0tzaUFwMV462TcQSL/xAaOn7v 1E2tItZtuu6W/aCj/GowZFka/8PG3Cn73o3UWsCurl6he/IZhXToCxQE4D5NT9Y= X-Gm-Gg: ASbGnct2BuXJDrHuan5sstWlZ0k4j29tXRh03jJjHLlPcuNfeT0gjMOWhdhJW4hDnR7 XaopH2HjgpoiqkjTeChvxUZYdlbv+7dBqZ2Fn1sNBLJpPyjBQ5Az7PyFxkk403GIn7xE9j6kv+m /S6bG8vG2PnKeb0T3r0q3uMucKDaWUE0rc0HhNKkWKO91koTOokeWaApTVfPyp64JNMoEKGtUAx 9Q+73H/Dvof2Z/D43fja7TfWr9PfSzhcTJafrfsdv3ZcLueLH9vHcKeFa0KICm/E3WMoIGk0y0= X-Google-Smtp-Source: AGHT+IF4Jo27q4ETbludjWBpajEIQe5Lwcy3rhUrDotwPLxM3dcXJ/vBW/WhJCkWEV8MIV0T5MfFcg== X-Received: by 2002:a17:90b:4f:b0:2ee:d9f5:cfb4 with SMTP id 98e67ed59e1d1-2f2e9386601mr7727908a91.36.1734594374568; Wed, 18 Dec 2024 23:46:14 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:46:14 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:45:29 +0900 Message-ID: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@gmail.com> 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 --- (no changes since v2) Changes in v2: - New. 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:45:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35040 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 0724A27BBEC; Thu, 19 Dec 2024 07:48:45 +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 8509D27BBE2 for ; Thu, 19 Dec 2024 07:48:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOBGQ-0002vy-Mc; Thu, 19 Dec 2024 02:48:06 -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 1tOBGN-0002uZ-Up for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:04 -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 1tOBGM-0002ki-UB; Thu, 19 Dec 2024 02:48:02 -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=JKaXg5CVvmHbZZWAGgFicsTCHyNbvF8R+4IuItKkJHg=; b=BR2Yh0TgBtO19XYPeFoiL/7lMsezX5UO4tbsqZW59LED5uZDmYmPX9l8mxBbHqoda4+bABjzImHzETRYyNK+jB33cg2jLtwqGATnRoxN4RO2/fh+Czm2hfbVGG9pO1rdiOOGQgli4lhbZLMrF4hn1yDFMBby9cXapib5fIpYrmbqJ4DRnGsz5ELDhTrIIDSFxoz7nxmjTBG4rJ5CYt9gfSMhk4i/XGBFG6H2vKBVAc1Myz2pHoIU/QqTfBBYuZWrX5BKGmcrU16c5Ctgoj+qJEAaYBxNL0Sj1U3E9jGQHgo2VJCOPPY4ZWbZYyq/vD6uoRmQiBnzSKWqETSxWmXx6A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOBGM-0008IJ-Bo; Thu, 19 Dec 2024 02:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH v3 2/5] 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:48:02 +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.173459444131768 (code B ref 74962); Thu, 19 Dec 2024 07:48:02 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:21 +0000 Received: from localhost ([127.0.0.1]:37279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFg-0008GE-EG for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:21 -0500 Received: from mail-pj1-f51.google.com ([209.85.216.51]:42168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFe-0008G5-Hc for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:19 -0500 Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2ef714374c0so391210a91.0 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734594377; x=1735199177; 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=JKaXg5CVvmHbZZWAGgFicsTCHyNbvF8R+4IuItKkJHg=; b=VK3fFbBHeheXMElUC2ZLINEVkTeTOYUjxvHpAk+JWOyOmtQxTpgJzidtsOuCnp1nq3 +Sty73TjbSMcqn/kMWLdCwgdXQKtn9jV6dqCNfOS+ZI9lbZ2+384mz1GlM/If+QYhNHq XQbIVjEeirJxV2RFX6krWvIVvt+dnPiLcp3vZ8erph/mtMLca3+Kye6t7fmiMARShutc V/yMXSTMkq4kNhVZhY52F0Wll6zZKIbmZ5GMkeknq1pqvCIcFtui5B5NxHxVZui9XY6z kUW71hdPvh+xtlHTLGehbLgObc8UyeNez3p4SzgUY8UzP6tNDxs9XZ9sON1aILFxx3gw EZ2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734594377; x=1735199177; 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=JKaXg5CVvmHbZZWAGgFicsTCHyNbvF8R+4IuItKkJHg=; b=AcChFcpDHtEbwU5YSaNmMFdxLHy+w6NhpWh52e5N+XasZul+OkMaoZnf7kBVkZHxFE 5T3wl76IXCaFH7JVyF3ZVhvHKPk9ePpBLoe+9cp4dxlJpggmeaJSCk6mR/fdqL5SNwTK vf6Dejph8nNWYkw7MPA82hLjDY8GI+oB5uX3d6h/BdMGupNsCtfB9FN9FB+Qg2Eu+pI/ eMTor13TSdw0B2tmCmW2u/ffLDvxmYfPNWSd+hsBCeDv15VAlT3sTCZ0YeNZ0aNK1kqi EDPWeTkeu7jD2NOVsO4suDi6ileaYiU75RWGkvhYRZWxwGogSPRdah8+QH6z28D22RMT S95Q== X-Gm-Message-State: AOJu0YwC3t1ylWOimYNf2qlxlcSnSGyiyaMIb9aspHCCu3zPmOh8myv9 ZFKjfx/rdbmF1p/hE/pWYX04eHsnz7At2fuNRPumKN5uGLtIOebhcUMz99z0gAw= X-Gm-Gg: ASbGncu8DOAhlEQd/zIvE1njl4tGkHtkSZv+kEMM/dmNnz9n2L5rJldCrk/qALRV95R IjOmm1+7DLHVlKdwWpzYx8PpryzrwimRvghznu0IXQsk9Afda6ZmszQllZ/aXNGMg/0p/dpia3K 4LiGuvAVzl3NA1hPvbWoQ43cu7EtDh+IDzj/fk+l6IPvMz+ViTLD7KaPQvV3u+2EqDCutf8zGpd Sfoo249RnPMeOQvfEr0I+ben4E+txWFy6RhtAW4PeuW/q0YTij6ddiPgdLsMtolMJONn/Y4k4g= X-Google-Smtp-Source: AGHT+IHxB9qiJQk5+0+RJhha0N1R7Fk3ShFHEHoHZYXwpGsjRRtXvEDm7yUDWxSlxuuBZIMkZpE+hw== X-Received: by 2002:a17:90b:2b83:b0:2ef:9dbc:38d1 with SMTP id 98e67ed59e1d1-2f4435ad5e6mr3331952a91.5.1734594376445; Wed, 18 Dec 2024 23:46:16 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:46:15 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:45:30 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@gmail.com> References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.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 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 --- (no changes since v1) 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:45:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35038 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 8140827BBEA; Thu, 19 Dec 2024 07:48:31 +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 E5B6827BBE2 for ; Thu, 19 Dec 2024 07:48:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOBGQ-0002vV-4K; Thu, 19 Dec 2024 02:48:06 -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 1tOBGN-0002uY-Ul for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:04 -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 1tOBGN-0002kk-26; Thu, 19 Dec 2024 02:48:03 -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=kyai9a0xw7doOzBfxMKg5s+5C0JGtZljzpCdMbXiOvo=; b=L1rZdttQJjAyRZLN0RN4uJak6wKD4TFwAYBsLrLDztvBGZrfl5yELvqkr8IYXEcTNDolCAcKALDXqwi0C9Dwp4MSN6IqLiZNF55xRn8HDjRNSON9+C4s5XHDTD7JF/KdTmgBWSYLu539EwFKVB/5xCeyLAn+J9dgWGU21rHaj73B1DTDX2hmL7RZXkf5xnnmDgrgAXrfwS/fyuQ18KsjS8nyMCeZFj5SPfS5YJqu+prnGiCk1H4AFhnt8A9pXoUitTPdCBBVRo25/LKw9ztaAPlZFjAS4MAHOd4z6GJvUtVGfUShm1FByo2y6mqr+YK4PffLa/m8768PqUCNYSj5+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOBGM-0008IP-SA; Thu, 19 Dec 2024 02:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH v3 3/5] 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:48:02 +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.173459444431786 (code B ref 74962); Thu, 19 Dec 2024 07:48:02 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:24 +0000 Received: from localhost ([127.0.0.1]:37282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFk-0008Gb-8H for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:24 -0500 Received: from mail-pj1-f44.google.com ([209.85.216.44]:55530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFg-0008G9-6s for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:20 -0500 Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2ee397a82f6so449741a91.2 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734594379; x=1735199179; 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=kyai9a0xw7doOzBfxMKg5s+5C0JGtZljzpCdMbXiOvo=; b=cQ2Ss5jYAnkIvmjJYD7VK6zhrAZSFm7kGimaSbPJSQT1cJB1joV3nJHEmOzMfYQrvF C7xF77k1zvueV63Ssy+XwPjnAJxqYzNs03QLiQLCOpgW2JeKf8gVFw3AvA/c68KD8Gy8 41/STsTMwg5COWWFy9yojrm3WtDPfSkqiKSWXdnCIA9szkT94sWct8P49qSCYHA8OXuW vnEWL58rkfFxvDMW5Oxecb9jtFHjMUG4Xmt9xBLscmfFp+5UV/ABQH+SXH1IVhkQq0Jp 5ygtTckkzklSmUwXnDtJDo5OW4GcoLucuGuin0XbLu4TGs6nenGAiJmL9AbMyb0J4UlT jhVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734594379; x=1735199179; 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=kyai9a0xw7doOzBfxMKg5s+5C0JGtZljzpCdMbXiOvo=; b=C1xRh0pH6mXFNjdcmxyVaBDc/UhlV9c8i9mDISJcEZd0YwePYELNO25gMN33t7/y+3 KGC4c/jRWWlxHsVqewuVJ8HyB57ALi1pQTMQjCvRidb6GX+9ez6eTpLh5JaWDmcTlMlO 9j2/Qy0H2W4nlSZqFVF7IQIXu6bIF+jrBsdFU1D2EOXwvJcESzcXS9jps4iv5Il0bKWG VPoOztFtLPV4Wcx0wC032omo+W2Nf0s8t/j8OnZ/mGOYP2HoXsb2B/Je8oTxphw2jKgx ohosmFlTfDo2rQD4pNNQXYtiosA97+SB/UkH1IeSLsC7q9qGl68Jz2MaG2/ggr+ezEen OfJg== X-Gm-Message-State: AOJu0YwOjcxNz7gI5e0K6Mfr+/QYNxPNtMJPppsr8Iku35YUXE8fRGMU jlDpXRg2SKPg0IaA+a8XXS+0VT1SLGas1Z12iAKFTVn6pOzKMdQbHKISlXctbo8= X-Gm-Gg: ASbGncs5IW5OLyohN8jLEBXvAje5dmysLpUxuGahz0BVYhLHM9FNpT2p//QJlDFXJcr T4dHiND63Xl7kx+VYxVKy1UGhZpbxib1/pVab9YJhAjoo1kF1N5ycykB/pIFJgl/eZf/Z+tAmEJ ZEi0M6cdHvLCD1MgBxy9+SgZf/5iM5UvzI6Pvtn76n9jGh41BU2X2paJvElDsrZzOlmZQYEMQ73 f6VpYqTyXDK3lxjt1vk1i12rNMzY35NOAYrm7jce/jTxNR0lqvoG6zg40T8elZ2oapk5JKq06M= X-Google-Smtp-Source: AGHT+IHaqv47HcSvymHPfH207MP2GkrZff3SOTqz626jSVK3QvdBfl1Xuosm2E5uLrtHUTfnbcEhSg== X-Received: by 2002:a17:90a:f945:b0:2ea:696d:732f with SMTP id 98e67ed59e1d1-2f443d452a9mr3492459a91.29.1734594378657; Wed, 18 Dec 2024 23:46:18 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:46:18 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:45:31 +0900 Message-ID: <093604124092d3b024127068cbbeff3f9aa62d76.1734594333.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@gmail.com> References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.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 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. (sys_delete_guix_daemon): Explicitly access first array item. (sys_create_store): Update shellcheck code to ignore. (SYSV_INIT_REQUIRE): Ignore unused warning. (sys_customize_bashrc): Ignore warnings due to using variables inside a literal. (main): Replace $@ with $* inside string. Change-Id: Ia88509b461b3844f2dd5abf9fb21a5b2bbb8a1e1 --- Changes in v3: - Add comments to avoid remaining shellcheck warnings. etc/guix-install.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 481eb6f12a..8d3d9d224b 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -77,6 +77,7 @@ REQUIRE=( # Add variables using form FOO_INIT_REQUIRE when init system FOO dependencies # should be checked. +# shellcheck disable=SC2034 # the variable name is computed SYSV_INIT_REQUIRE=( "daemonize" ) @@ -151,7 +152,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 @@ -390,7 +391,7 @@ sys_create_store() ~root/.config/guix/current GUIX_PROFILE=~root/.config/guix/current - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "${GUIX_PROFILE}/etc/profile" _msg "${PAS}activated root profile at ${GUIX_PROFILE}" } @@ -427,12 +428,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 +446,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 @@ -551,7 +552,7 @@ sys_delete_guix_daemon() local local_bin local var_guix - _debug "--- [ $FUNCNAME ] ---" + _debug "--- [ ${FUNCNAME[0]} ] ---" info_path="/usr/local/share/info" local_bin="/usr/local/bin" @@ -681,7 +682,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"; @@ -696,8 +697,10 @@ sys_customize_bashrc() for bashrc in /home/*/.bashrc /root/.bashrc; do test -f "$bashrc" || continue + # shellcheck disable=SC2016 # checking for literal $GUIX_ENVIRONMENT grep -Fq '$GUIX_ENVIRONMENT' "$bashrc" && continue cp "${bashrc}" "${bashrc}.bak" + # shellcheck disable=SC2016,SC2028 # that's also a string literal echo ' # Automatically added by the Guix install script. if [ -n "$GUIX_ENVIRONMENT" ]; then @@ -747,10 +750,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 +901,7 @@ main() if [ '--uninstall' = "${uninstall_flag}" ]; then main_uninstall else - echo "unsupported parameters: $@" + echo "unsupported parameters: $*" exit 1 fi fi From patchwork Thu Dec 19 07:45:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35039 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 E3A9727BBEA; Thu, 19 Dec 2024 07:48:35 +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 6F05D27BBE2 for ; Thu, 19 Dec 2024 07:48:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOBGR-0002w2-Kl; Thu, 19 Dec 2024 02:48:07 -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 1tOBGO-0002uw-Cc for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:04 -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 1tOBGO-0002l5-3i; Thu, 19 Dec 2024 02:48:04 -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=QfXLRdKWac+l1JVI0CcxwfLR7mQ3W5V+OryjERhOp70=; b=VyDFBDUT6RWi71GV32wq3CkbpgPfMQJnvxXa8F1a8Z3iD4tiZav6VQBB4iWmvEPJdfBc4MlC8Sx4FV5WUJZI0GW4CJmC2xnYw3pJ2YzXo6dAuLXOoy38bR8gPYaIKemRJiF5beStgfrfyQzMLTWk5Tma4V3e1QltVL8EiToy0dMC+5nXPui62HD+6NQpCOdHo9NNntV0y6Rz3wTA/JIb+1u9F0YShUTxmk0zbyjK8fng/wp2Eh8OMTyijSicxagxZq1lzm2zD1iW8GDPA9U8eH9065V27k3kxQzAeKUFq2P48i2tyYndW7uYIcSzMX/Q2aZfRtoLzDJk8W8AV/6JTw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOBGN-0008Ih-U9; Thu, 19 Dec 2024 02:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which' commands from requirements. 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:48:03 +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: Simon Josefsson , 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.173459444931817 (code B ref 74962); Thu, 19 Dec 2024 07:48:03 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:29 +0000 Received: from localhost ([127.0.0.1]:37288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFp-0008H0-5I for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:29 -0500 Received: from mail-pg1-f175.google.com ([209.85.215.175]:44096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFm-0008GU-Tg for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:27 -0500 Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7fd17f2312bso305058a12.0 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734594381; x=1735199181; 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=QfXLRdKWac+l1JVI0CcxwfLR7mQ3W5V+OryjERhOp70=; b=fqURryhHD48rnWcZwIRuuliByu78NRdrXIVUDMYBbWGomWqcfiKqyO2VO+ZPBDbE6s Wxvg2/vWI8VBut/ew44OgYRrYxVs2a29cxpJKvHcbpUZK0DDf69yF+dHkNv3wdALGNWa AOGEuwQhqCjbwiPnQlKx/I29dQHFS7dAQULveg3ptXdksC5g0GRu4IGgAcYx9LoBmvoe lRVlNOIGmEGGreDyb7aoL5NEV97HUUzUgohX7zgPFS/fxTXsRoPbfCWCPN5/yuyCW51A r7sgqvH4C1ZfhIPKHR6VOEf+iQwSAEawD7Jf8iKRFLc3FDjGApTPE4utogLHR4gZ1bKt KdKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734594381; x=1735199181; 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=QfXLRdKWac+l1JVI0CcxwfLR7mQ3W5V+OryjERhOp70=; b=cqfg8baf7qP3rbPBAc6McURm/d0qcbEs+MWadexEks4wi88mbFNo0BI6VmN4MWCvoj mayR0RCHe9oPW/JG4HtWv3/LipqnHQZvpXIqKv4RWG+ZireKyIkZYfvORMl3oSD0T+FH nFZImVhjeX8KulGHjhMQ9e9u4A9viaVVR5BHvmNq5n6t72TQ4BNrWRmnafrZqVvXW5n/ H8lEdCmpBjh5tXFEmowqsJkT2S05k7j5jpb1/efSoXNGkoqnVQmkVcoNE1zCJk7hICSD FHNAKVk54wdODbQKxKRfT8IP+15J/gaSINLGdnfxoNUkHQcma8I7LGLclbekspvZcYyV r/jg== X-Gm-Message-State: AOJu0YxcaniTMNUrSJdWVhC/4RQLJamGrmxUiIeKQWhT8EuWecXrF1LA ehQIV0e+bfYFH6kGsQzqtzASEFQBSsV6qDrOOktCtLCkFL5FvbB7inSE1hMU9hE= X-Gm-Gg: ASbGncuVfDhxlfSkYvpsCYBtedRUuwwTMYHzutX28rfWAeCv3ufAcX6hU0Xu0bQM13l Ly2HbM50IwdYxho8JJo2G27nAR3qAwEJ7H6GBp+laq1kdv7shnpBhv8DGzQJ933UeoNVlw07xZe jpCI6W3SmlW0v7Cv50sRj15A1STuoqMUoF2SelzwctsTQ+OEHGSBz5mdCePYKot8rCa/dv1MBbv zw+mH04aCsaLxAva2RRfgbWf2Di5y5dpWtN5uj0ivs/wwKYS+GLv/Vj09UzFuUgom39qe6wek0= X-Google-Smtp-Source: AGHT+IEi8kkno3BmGpVLxKtgaXOqqPvrAlEoyupybimJMODH97HA5Zkfv9i6jUFsGjnUrc0sQ9iYIA== X-Received: by 2002:a17:90b:524f:b0:2f4:49d8:e6f6 with SMTP id 98e67ed59e1d1-2f449d8e82emr1288257a91.3.1734594380685; Wed, 18 Dec 2024 23:46:20 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:46:20 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:45:32 +0900 Message-ID: <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@gmail.com> References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.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 (REQUIRE): Remove "which". Add "nologin". (sys_create_build_user): Use 'type' instead of 'which'. Fixes: Reported-by: Simon Josefsson Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71 --- Changes in v3: - New. etc/guix-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 8d3d9d224b..fb22287cf4 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -58,7 +58,7 @@ REQUIRE=( "wget" "gpg" "grep" - "which" + "nologin" "sed" "sort" "getent" @@ -429,12 +429,12 @@ sys_create_build_user() if id "guixbuilder${i}" &>/dev/null; then _msg "${INF}user is already in the system, reset" usermod -g guixbuild -G "guixbuild${KVMGROUP}" \ - -d /var/empty -s "$(which nologin)" \ + -d /var/empty -s "$(type -P nologin)" \ -c "Guix build user $i" \ "guixbuilder${i}"; else useradd -g guixbuild -G "guixbuild${KVMGROUP}" \ - -d /var/empty -s "$(which nologin)" \ + -d /var/empty -s "$(type -P nologin)" \ -c "Guix build user $i" --system \ "guixbuilder${i}"; _msg "${PAS}user added " From patchwork Thu Dec 19 07:45:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 35037 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 93C8427BBE9; Thu, 19 Dec 2024 07:48:23 +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 C367727BBE2 for ; Thu, 19 Dec 2024 07:48:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOBGS-0002wJ-04; Thu, 19 Dec 2024 02:48: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 1tOBGO-0002v5-RX for guix-patches@gnu.org; Thu, 19 Dec 2024 02:48:04 -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 1tOBGO-0002lH-IN; Thu, 19 Dec 2024 02:48:04 -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=a6OjoX+g5Z9nRYrvIvc2RZZ7lVV4npKKXZgXGI0bhKg=; b=TY/Iv7b21AzE7ObYwNU6LbFrVcJCz3AFp7crM3fG8qrOTBXTDIH+KT8wJ9MIa0oy67g4DBJccCI/XwiKZDTaJPh7BUjlW/QVCL2AnRgRUJAGXcmlu4iXtqPDSihG9UCTloCvuzTrUr9m5RbUNkWe5d1OF3gYGsbWRm/MFtqi0nYxdNhV+p57PMaWUeMmQ+NRJZ615wDJlrmA+1iLSdU+LWqHRmqMyeL2M43qNYbR1fTM0Mo5PMBDY+XhSDHqMYPXzCT1czNnBE4mhHNVi8BbatkPEf8B5XT9AeMgSM3xgaqz7hxjZQCb1FKRwaHNhNFgtmaRJw9EQiC9q7soAepXMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOBGO-0008Iq-EI; Thu, 19 Dec 2024 02:48:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74962] [PATCH v3 5/5] etc/guix-install.sh: Sort requirements. 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:48: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 , 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.173459445331829 (code B ref 74962); Thu, 19 Dec 2024 07:48:04 +0000 Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:33 +0000 Received: from localhost ([127.0.0.1]:37290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFt-0008HJ-J5 for submit@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:33 -0500 Received: from mail-pg1-f171.google.com ([209.85.215.171]:44364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOBFo-0008GZ-VW for 74962@debbugs.gnu.org; Thu, 19 Dec 2024 02:47:29 -0500 Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7f71f2b1370so242908a12.1 for <74962@debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734594382; x=1735199182; 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=a6OjoX+g5Z9nRYrvIvc2RZZ7lVV4npKKXZgXGI0bhKg=; b=eR1GkjLnmw+R60UZgAnpSYXvYrUFhWS9n6ZBx5XZpJhVjUCLO/0wkR4ITTQ50gEQRB /9tspx0a61gH1j/Hbzg9NUTt5mU1s8oG7CxbG+T1cvqUWHehMnAVWRb95XozSj+ofihY HLz3mTpQPuRNco5FwYrLD+cS63ij0WmE7LM8UO5qtbC263/HIbXTXWwMOSNj6a/gM88S 1AQ7Qk1lMBaAmInFj3qYWES25eALSFSyRGQBVOnAmLQFBdZeUUdQFrregNfhsIEQ4MRm RicGwaPOfcOgxPDIZLHQvb56K7QNV5Iy80TzwPF/qRkugO0FyHDXIOTtKtnOkeT9nLs7 3MDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734594382; x=1735199182; 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=a6OjoX+g5Z9nRYrvIvc2RZZ7lVV4npKKXZgXGI0bhKg=; b=Hb2yYzH6s9ngF5aWZH84p3pecY33lusc2wq+Fd8pq6CzOGKePQfE/DWXAymKQdDY3A keStrD/+rNzH75v8kK3pehR/hJqalVU8qapTAmXp2qQ66jKmhW4LP+GcwYunbpCB5rl1 5tTRDMnL51GQRS6GOMUvEhiXNg/eY+HmK/3rhXffj4vAJ5zBDOKVPQqCfX9y12lCavyi /OVz2NEtQ3vAr8KmgL0iy5udMeBCFPN+X+Lh4284MlOxPlo2WpPP3tqSZ21kG3yWqC7C ZrT4pp7MDMIzSCdu4CZ9f4AL2B32/E1ntjNGX4IIwHTrI1GqFttM+BS23cJZL8LOaTkP prqg== X-Gm-Message-State: AOJu0YwSMgZX2RmwrPvvVsGYC5nfchGSV3jckvoKe8E18YNrkRRj/j3O 3IiNi3eGbA/WI0a3iSpCcTyIFYy0l5rMWCy06+7/JZj/hBqxOUazf174kZ/5JEc= X-Gm-Gg: ASbGnctlsXWcFPQkAVyxHZeomjRoc879vCJX20vcarYWg4mbF/g+GMwyHXXm98Vhp5x 6iwYJ1t3MFAFQtyRjSA4f00NGvjb34Lz0jzEttW4zdVD9PJwWhjjT1tKUPBcqXLc2905Z9f+s+y h82rDCdP6fcPadziRskHXGp5ltAKnFJH9D35jZPfo4uRIHdfcQDSE6kY7KVlrwLcfms2jWzBOfp CMctDsTmSk050Rk8sWlEpatZzfepu5lU1apVbCkiXfzD0ioRdek75I1t39dD5lHAU1ANo318/k= X-Google-Smtp-Source: AGHT+IHQCdnPrsozPmsseSXW/5XNUM4fRAcfIhxafQ1b9JQrN/fALm3zFh1/t37K+nwdwtmHXRkByg== X-Received: by 2002:a17:90a:c884:b0:2ee:d824:b559 with SMTP id 98e67ed59e1d1-2f2e938a64fmr7460575a91.28.1734594382441; Wed, 18 Dec 2024 23:46:22 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:46:21 -0800 (PST) From: Maxim Cournoyer Date: Thu, 19 Dec 2024 16:45:33 +0900 Message-ID: <027645209ae74112b8b70749ab23042a26ad99d6.1734594333.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@gmail.com> References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.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 (REQUIRE): Sort. Change-Id: I59c57da31cd3846cf21810d5978d7d32516e0868 --- Changes in v3: - New 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 fb22287cf4..59d0d3820e 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -53,25 +53,25 @@ set -eo pipefail [ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; } REQUIRE=( + "chmod" "dirname" - "readlink" - "wget" + "getent" "gpg" "grep" + "groupadd" + "groupdel" + "mktemp" "nologin" + "readlink" + "rm" "sed" "sort" - "getent" - "mktemp" - "rm" - "chmod" + "tail" + "tr" "uname" - "groupadd" - "groupdel" "useradd" "userdel" - "tail" - "tr" + "wget" "xz" )