summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2026-08-10 08:38:56 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2026-08-25 10:05:08 +0900
commitd485ff319a82fb4d497e1d5435d881608f4bdf10 (patch)
treee3a7ea9d1ee4d6600300aee0b9cb4fd86fbdf110
parentb836c9fd5161eec573ed64cbe30bfe641af7d1af (diff)
etc/committer: Avoid using an Autoconf template.
This does not seem to be critical here, and hampers hackability (a ./configure re-run was needed to regenerate the file). * etc/committer.scm.in: Rename to... * etc/committer.scm: ... this. Adjust shebang to use /bin/sh and 'guix repl'. * .gitignore: De-register etc/committer.scm.
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rwxr-xr-xetc/committer.scm (renamed from etc/committer.scm.in)5
3 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index c1f1a0a13c9..d9fab9b1921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,6 @@
69/doc/version.texi 69/doc/version.texi
70/doc/version-*.texi 70/doc/version-*.texi
71/etc/apparmor.d/tunables/guix 71/etc/apparmor.d/tunables/guix
72/etc/committer.scm
73/etc/gnu-store.mount 72/etc/gnu-store.mount
74/etc/guix-daemon.cil 73/etc/guix-daemon.cil
75/etc/guix-daemon.conf 74/etc/guix-daemon.conf
diff --git a/configure.ac b/configure.ac
index 63902ee5ea5..5140660c6fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,7 +327,6 @@ AC_CONFIG_FILES([Makefile
327 etc/apparmor.d/tunables/guix 327 etc/apparmor.d/tunables/guix
328 guix/config.scm]) 328 guix/config.scm])
329 329
330AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm])
331AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env]) 330AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
332AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], 331AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
333 [chmod +x pre-inst-env]) 332 [chmod +x pre-inst-env])
diff --git a/etc/committer.scm.in b/etc/committer.scm
index aec4d82a510..9f80ed509ab 100755
--- a/etc/committer.scm.in
+++ b/etc/committer.scm
@@ -1,5 +1,6 @@
1#!@GUILE@ \ 1#!/bin/sh
2--no-auto-compile -s 2# -*- mode: scheme; -*-
3exec guix repl -- "$0" "$@"
3!# 4!#
4 5
5;;; GNU Guix --- Functional package management for GNU 6;;; GNU Guix --- Functional package management for GNU