From patchwork Sun Oct 22 20:07:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 55130 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 8F2CF27BBE9; Sun, 22 Oct 2023 21:08:56 +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 205B027BBE2 for ; Sun, 22 Oct 2023 21:08:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quekY-0003Ks-Dt; Sun, 22 Oct 2023 16:08:38 -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 1quekT-0003KP-K2 for guix-patches@gnu.org; Sun, 22 Oct 2023 16:08:34 -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 1quekT-0004ya-CM for guix-patches@gnu.org; Sun, 22 Oct 2023 16:08:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quekv-0001Q2-SU for guix-patches@gnu.org; Sun, 22 Oct 2023 16:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66605] [PATCH v5] teams: Adjust shebang to use 'guix repl'. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Oct 2023 20:09: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 , =?utf-8?q?Cl=C3=A9ment?= Lassieur Received: via spool by 66605-submit@debbugs.gnu.org id=B66605.16980053315434 (code B ref 66605); Sun, 22 Oct 2023 20:09:01 +0000 Received: (at 66605) by debbugs.gnu.org; 22 Oct 2023 20:08:51 +0000 Received: from localhost ([127.0.0.1]:48329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1queki-0001PV-1N for submit@debbugs.gnu.org; Sun, 22 Oct 2023 16:08:51 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:42474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quekc-0001PA-Qu for 66605@debbugs.gnu.org; Sun, 22 Oct 2023 16:08:46 -0400 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-77891f362cfso219361785a.1 for <66605@debbugs.gnu.org>; Sun, 22 Oct 2023 13:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698005288; x=1698610088; 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=eF5aJWeKcY6CCVwHNWH7rK8mVOBIBOm6PQH19UnEdQQ=; b=e6O76am2hxKv5IjMNIwMy1OljVPTymc6ZfkpBT5WVGwUixvCm2NjUIog7JEX1C2f3G isHIFfg1kZcpRokZIgFieLa+prNehps1Nuf4ZYzeqI1hlq33D76rmFkwWfB/bx1j+vJZ jUv1M7aFMJY38lHQBTnYTSzeYp1tZRrQYcaNcg7f7/W1oYNGF4BaH2ZBR5HtGA+5Rtju tVVz0Qjm5x+eakxzwnswXf6YfFbWPZ15ntOYyf0VwnxO6rkM8P6nNtCNvf3NII9IwO02 RqOqCuN0E2kDp4fpee9FjnPQFWLLa1rO4mTV9RJvgNykN5zUeO+/arL3gse17WdUAFeH pH3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698005288; x=1698610088; 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=eF5aJWeKcY6CCVwHNWH7rK8mVOBIBOm6PQH19UnEdQQ=; b=Oz98xHmxVCkHrTKiSKvFdtWzBeiVOjGG6txkh0IqE/ZJk0dG88T5OjQczZHejzHuuG hEW5TNpFnmBfGsGhLLyaR1McCp213Zf0pfa1WMV9THNusOVFre0D2JxG7RQesycbillP TnHt8Aaykx+LAsg1smyrgUctyS+hMP/OZCJE7ayGEiKaUsKbcU9XhcSaV76Yjkn0T7b0 9G+wYlOstasllmhpG661uVEcvdE7eU/IcWshWXLOHEdrGYd1bw9+ZATvMHWKcxvh7oLM L3tILB1lnIIA5YruOnUiVZUbGFb9yZIqjrALgtvH0rKVYnJiIgFJbeL6UoDX0GmYz4+j V7Tg== X-Gm-Message-State: AOJu0Yw++w3+2dxEfirZvyJJVRRS60rw9vVpLzpxWr4N+6K7pA2p7Y+E D8kfv701JwkZu32ajY+qvy27KEEdB8Y= X-Google-Smtp-Source: AGHT+IEIfW9HpXKlTPQJVqN1cPLUOwFOiq1em5GTQcrCxsWFO0mF9G2ilIIzBW0Cgb2RIDQ48M9ndA== X-Received: by 2002:a05:620a:4155:b0:76e:f90d:85d1 with SMTP id k21-20020a05620a415500b0076ef90d85d1mr10704514qko.26.1698005288333; Sun, 22 Oct 2023 13:08:08 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-191.b2b2c.ca. [205.236.230.191]) by smtp.gmail.com with ESMTPSA id o8-20020a05620a228800b0076cdc3b5beasm2226889qkh.86.2023.10.22.13.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 13:08:07 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 22 Oct 2023 16:07:36 -0400 Message-ID: <7ab82f90b104c99781b759d3799ae0553ab256f9.1698005256.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.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 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 --- Changes in v5: - Redirect command -v output to /dev/null .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: faeebdc37e9137d62e11175e83988f77496a6641 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..0b25955701 --- 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 > /dev/null || pre_inst_env_maybe=./pre-inst-env +exec $pre_inst_env_maybe guix repl -- "$0" "$@" !# ;;; GNU Guix --- Functional package management for GNU