GNU bug report logs - #68804
[PATCH] Remove an unneeded sed command for emacs.service

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 29 Jan 2024 22:21:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 29 17:21:36 2024
Received: from localhost ([127.0.0.1]:33644 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rUa0V-0007Yl-V8
	for submit <at> debbugs.gnu.org; Mon, 29 Jan 2024 17:21:36 -0500
Received: from lists.gnu.org ([2001:470:142::17]:57062)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <me@HIDDEN>) id 1rUa0V-0007Ya-0w
 for submit <at> debbugs.gnu.org; Mon, 29 Jan 2024 17:21:35 -0500
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 <me@HIDDEN>) id 1rUa0A-00020T-DG
 for bug-gnu-emacs@HIDDEN; Mon, 29 Jan 2024 17:21:15 -0500
Received: from mail.linj.tech ([5.255.109.209])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <me@HIDDEN>) id 1rUa08-0001IB-LB
 for bug-gnu-emacs@HIDDEN; Mon, 29 Jan 2024 17:21:14 -0500
From: Lin Jian <me@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linj.tech; s=mail;
 t=1706566868; bh=lqx/4yLDlqCPozStgKVra984Kic38K+PXMjiTPEqIYk=;
 h=From:To:Subject:Date;
 b=w6yKilKjk02b6s0zHv/CT6mMcyUf7hq6h7TjcdcCugHahLTwMFjUrL2I3qNfxGGJE
 5xSC/t2WaMPOxuRlz58Mi8/48Bp1dbJNk5KgWSb0dX5VjB7PS7sF3tWcRlUnu0J2mY
 weOAqJ982CO5R27QTrXaeMBXOMtqbyiUINMEf7epvUw0MR3Fh8ehKohUULSME76+AQ
 64ODKoPgybwKABC/NHeNdbqale6ngj1sH9zbbZ9lrAfzE01qXIrftJFdtbj8bja/FR
 HJcAucWKC7tftz2z6Oo9S7WmPXGIMJBoFSRqRvHG48T9v7s7gQnWWUN7LYdELKce/q
 ALtjoitvIEeCg==
To: bug-gnu-emacs@HIDDEN
Subject: [PATCH] Remove an unneeded sed command for emacs.service
Date: Tue, 30 Jan 2024 06:19:09 +0800
Message-ID: <87cytjye5u.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Received-SPF: pass client-ip=5.255.109.209; envelope-from=me@HIDDEN;
 helo=mail.linj.tech
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

--=-=-=
Content-Type: text/plain

Tags: patch


After commit e5348f125ff03ac70713e5b227f9e51f759a587b on
2020-12-14, there is no ExecStop in etc/emacs.service.

So there is no need to use sed to substitute emacsclient for the
ExecStop key.

I propose a patch to remove this unneeded sed command.

In GNU Emacs 29.1 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo
version 1.18.0, Xaw3d scroll bars)
Windowing system distributor 'The X.Org Foundation', version 11.0.12101010
System Description: NixOS 24.05 (Uakari)

Configured using:
 'configure
 --prefix=/nix/store/mzdvpxzkhlryxmbxwbih7bgvkzkw1ly7-emacs-29.1
 --disable-build-details --with-modules --with-x-toolkit=lucid
 --with-xft --with-cairo --with-compress-install
 --with-toolkit-scroll-bars --with-native-compilation
 --without-imagemagick --without-small-ja-dic --with-tree-sitter
 --with-xinput2 --without-xwidgets'


--=-=-=
Content-Type: text/patch
Content-Disposition: attachment;
 filename=0001-Remove-an-unneeded-sed-command-for-emacs.service.patch

From 665c80556750d15ad6ce988078a38c0964bacbf6 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@HIDDEN>
Date: Tue, 30 Jan 2024 06:12:43 +0800
Subject: [PATCH] Remove an unneeded sed command for emacs.service

After commit e5348f125ff03ac70713e5b227f9e51f759a587b on
2020-12-14, there is no ExecStop in etc/emacs.service.
* Makefile.in (install-etc): Remove an unneeded sed command for
etc/emacs.service.

Copyright-paperwork-exempt: yes
---
 Makefile.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 996f7b8d8c7..57df948a397 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -873,11 +873,9 @@ install-etc:
 	rm -f $${tmp}
 	umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
 	tmp=etc/emacs.tmpservice; rm -f $${tmp}; \
-	client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
 	sed -e '/^##/d' \
 	  -e "/^Documentation/ s/emacs(1)/${EMACS_NAME}(1)/" \
 	  -e "/^ExecStart/ s|emacs|${bindir}/${EMACS}|" \
-	  -e "/^ExecStop/ s|emacsclient|${bindir}/$${client_name}|" \
 	  ${srcdir}/etc/emacs.service > $${tmp}; \
 	$(INSTALL_DATA) $${tmp} "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service"; \
 	rm -f $${tmp}
-- 
2.42.0


--=-=-=--