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; }