commit:     61cce3b19e81b363145d38cf8418fe031caf0c7a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  2 18:43:03 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 18:43:03 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=61cce3b1

Drop intermediate variables from init script

* emacs.initd (EMACS_START, EMACS_SIGNAL_TIMEOUT): Don't assign
intermediate variables. Bug 966964.

Bug: https://bugs.gentoo.org/966964
Suggested-by: Filip Kobierski <fkobi <AT> pm.me>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog   | 5 +++++
 emacs.initd | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97b23d6..722b4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2025-12-02  Ulrich Müller  <[email protected]>
+
+       * emacs.initd (EMACS_START, EMACS_SIGNAL_TIMEOUT): Don't assign
+       intermediate variables. Bug 966964.
+
 2025-07-21  Ulrich Müller  <[email protected]>
 
        * Version 1.13 released.

diff --git a/emacs.initd b/emacs.initd
index 392ae66..0a14a9a 100644
--- a/emacs.initd
+++ b/emacs.initd
@@ -3,16 +3,14 @@
 # Distributed under the terms of the GNU General Public License v2 or later
 
 : "${EMACS:=/usr/bin/emacs}"
-: "${EMACS_START:=/usr/libexec/emacs/emacs-wrapper.sh}"
-: "${EMACS_SIGNAL_TIMEOUT:=TERM/30/KILL/5}"
 
 description="Start an Emacs server running in the background"
 
 supervisor=supervise-daemon
-command="${EMACS_START}"
+command="${EMACS_START:-/usr/libexec/emacs/emacs-wrapper.sh}"
 command_args="${EMACS_OPTS}"
 command_args_foreground="--fg-daemon"
-retry="${EMACS_SIGNAL_TIMEOUT}"
+retry="${EMACS_SIGNAL_TIMEOUT:-TERM/30/KILL/5}"
 
 depend() {
     after dbus

Reply via email to