From patchwork Sat Oct 21 03:39:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 55107 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 41C5727BBE2; Sat, 21 Oct 2023 04:41:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 A75B727BBE9 for ; Sat, 21 Oct 2023 04:40:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qu2qr-0007ze-CJ; Fri, 20 Oct 2023 23:40:37 -0400 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 1qu2qp-0007zP-Nj for guix-patches@gnu.org; Fri, 20 Oct 2023 23:40:35 -0400 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 1qu2qo-0004DV-Mq for guix-patches@gnu.org; Fri, 20 Oct 2023 23:40:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qu2rF-0004kc-ML for guix-patches@gnu.org; Fri, 20 Oct 2023 23:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66605] [PATCH v3] teams: Adjust shebang to use 'guix repl'. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Oct 2023 03:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 66605@debbugs.gnu.org Cc: Maxim Cournoyer , clement@lassieur.org Received: via spool by 66605-submit@debbugs.gnu.org id=B66605.169785963018206 (code B ref 66605); Sat, 21 Oct 2023 03:41:01 +0000 Received: (at 66605) by debbugs.gnu.org; 21 Oct 2023 03:40:30 +0000 Received: from localhost ([127.0.0.1]:41981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qu2qe-0004jR-Q8 for submit@debbugs.gnu.org; Fri, 20 Oct 2023 23:40:30 -0400 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]:53252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qu2qX-0004j6-Qw for 66605@debbugs.gnu.org; Fri, 20 Oct 2023 23:40:23 -0400 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-66d998b5f3cso6731096d6.2 for <66605@debbugs.gnu.org>; Fri, 20 Oct 2023 20:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697859584; x=1698464384; 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=8ein2dp9bPso+cHjT4LC8JB14TQN4XhtVT7CuaHg5Ho=; b=UbIdkG2llzOhwp6zm4ntkFBOtUvkfsyOlO1IekYxjv6vmRpTF505twTbqzr0yUoH/j XelS6XcNBFUHBKNad3nTLqYQsBxWwmTtvckI1usAAnVpcmDZA7AlxoMI6oZjewJ57ND+ rbyMMlMquWK0LSTcYsVBQiMDl9G7aFpr+i++djGRFJo5QuemLXQ84LdD/crJoXeAxJJa vPkzZt5JxummI4LS6wjIo5RfFnENXcUNtzjMndF8gBxnleeMaBeW0wtYj9M3RIz8tXcz NXfNR8uRa5aSPkoXfAdJRB4bPHjou+clvTMMbD8EKtJ0xOvmPu5qdMklPKw5sYIIfWnp SC4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697859584; x=1698464384; 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=8ein2dp9bPso+cHjT4LC8JB14TQN4XhtVT7CuaHg5Ho=; b=rSNv+CQMulcASMrfuEcdUSpAOFBAOy5lCs0ImnyRT7JaXVA0YI3AeyW6j+yHVgFq3/ JgfMBS11VDAJ+1OvHveoh1T8MG5kgA//uREqCtTeZN/S09HZFA5vWcSW3b+4EgTDxtow 02PQgO0f2WoSbba27bo3Ffl1w0na3GNT79WIGQqzIiPwCw44TK7QxNmC5oAhTxxsT1Z2 9HKXMV0iNrZ8FxUoqRWnXS9eR+0LQJ2MStxpkxscRMCqNDIIp81RdHYxCDXwnEvIKRIR SsZEa5ufmFOrCkdx3Eu9jq3OYkwXebMPgA445jzpOR2Fpll/0uigOLnbjatddOhCAnkq eR2Q== X-Gm-Message-State: AOJu0Yyy2uhCURih/e7qq2dtgWeNm7sJbj9XIq1hS3Q18LcIOII2tt3n 14xCY9ARoZAl4KUPmNR3+urH1lE0Fd7n3Q== X-Google-Smtp-Source: AGHT+IFO4RTuuEwR6LW8deJktk0iUhXog6Y8xL5zK33D8N+HhsvM6LJpILWgkF90jUE9o6FwPwYNHQ== X-Received: by 2002:ad4:5c8a:0:b0:66d:352e:b2ef with SMTP id o10-20020ad45c8a000000b0066d352eb2efmr4223254qvh.61.1697859584368; Fri, 20 Oct 2023 20:39:44 -0700 (PDT) Received: from localhost.localdomain (dsl-156-111.b2b2c.ca. [66.158.156.111]) by smtp.gmail.com with ESMTPSA id bk6-20020a05620a1a0600b00775afce4235sm1093072qkb.131.2023.10.20.20.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 20:39:43 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 20 Oct 2023 23:39:33 -0400 Message-ID: <299e89a115bf711529aca404d133c2a741249fb6.1697859573.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.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 ensures the correct Guix dependencies are always available for the script. * etc/teams.scm.in: Rename to... * etc/teams.scm: ... this. Adjust shebang. * .gitignore: No longer ignore it. * configure.ac: Do not process it with AC_CONFIG_FILES. Fixes: https://issues.guix.gnu.org/66605 Change-Id: I7a01750c6c5f0696b6c36b1e6caa9389d9e6822c --- .gitignore | 1 - configure.ac | 1 - etc/{teams.scm.in => teams.scm} | 8 ++++++-- 3 files changed, 6 insertions(+), 4 deletions(-) rename etc/{teams.scm.in => teams.scm} (99%) mode change 100644 => 100755 base-commit: d2111894c48b2ebd7e7be683c07241bbd8a91919 prerequisite-patch-id: b8372a944dab5ec4df332a27705ff18e6a0e679c diff --git a/.gitignore b/.gitignore index 543dc1c655..0f74b5da3d 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,6 @@ /doc/version.texi /doc/version-*.texi /etc/committer.scm -/etc/teams.scm /etc/gnu-store.mount /etc/guix-daemon.cil /etc/guix-daemon.conf diff --git a/configure.ac b/configure.ac index d817f620cf..ecbd596a34 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,6 @@ AC_CONFIG_FILES([Makefile guix/config.scm]) AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm]) -AC_CONFIG_FILES([etc/teams.scm], [chmod +x etc/teams.scm]) AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env]) AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], [chmod +x pre-inst-env]) diff --git a/etc/teams.scm.in b/etc/teams.scm old mode 100644 new mode 100755 similarity index 99% rename from etc/teams.scm.in rename to etc/teams.scm index 55242caad1..98bbfd9e57 --- a/etc/teams.scm.in +++ b/etc/teams.scm @@ -1,5 +1,9 @@ -#!@GUILE@ \ ---no-auto-compile -s +#!/bin/sh +# Extra care is taken here to ensure this script can run in most environments, +# since it is invoked by 'git send-email'. +pre_inst_env_maybe= +command -v guix || pre_inst_env_maybe=./pre-inst-env +exec $pre_inst_env_maybe guix repl -- "$0" "$@" !# ;;; GNU Guix --- Functional package management for GNU