ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

teams: Adjust shebang to use 'guix repl'.

Browse source 
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.

Reported-by: Clément Lassieur <clement@lassieur.org>
Fixes: https://issues.guix.gnu.org/66605
Change-Id: I7a01750c6c5f0696b6c36b1e6caa9389d9e6822c
This commit is contained in:
Maxim Cournoyer 2023-10-20 22:19:24 -04:00
parent 85f934ccff
commit 4cf4dcb8b3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -68,7 +68,6 @@
/doc/version.texi /doc/version.texi
/doc/version-*.texi /doc/version-*.texi
/etc/committer.scm /etc/committer.scm
/etc/teams.scm
/etc/gnu-store.mount /etc/gnu-store.mount
/etc/guix-daemon.cil /etc/guix-daemon.cil
/etc/guix-daemon.conf /etc/guix-daemon.conf

1
configure.ac
View file

@ -281,7 +281,6 @@ AC_CONFIG_FILES([Makefile
guix/config.scm]) guix/config.scm])
AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.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([test-env:build-aux/test-env.in], [chmod +x test-env])
AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
[chmod +x pre-inst-env]) [chmod +x pre-inst-env])

8
etc/teams.scm.in → etc/teams.scm Normal file → Executable file
View file

@ -1,5 +1,9 @@
#!@GUILE@ \ #!/bin/sh
--no-auto-compile -s # 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 ;;; GNU Guix --- Functional package management for GNU