From 52b9a0f91094888b9dd55d3d5a50cb44887ff3d3 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Mon, 6 May 2024 10:41:53 +0200
Subject: [PATCH] Add path placeholder for telega-server-command and etc-file.

---
 telega-core.el      | 3 +--
 telega-customize.el | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/telega-core.el b/telega-core.el
index f798b40..2db0d64 100644
--- a/telega-core.el
+++ b/telega-core.el
@@ -45,8 +45,7 @@
 (defun telega-etc-file (filename)
   "Return absolute path to FILENAME from etc/ directory in telega.
 Use FILENAME as is if resulting file does not exist."
-  (let ((abspath (expand-file-name (concat "etc/" filename)
-                                   telega--lib-directory)))
+  (let ((abspath (concat "@TELEGA_SHARE@" "/" filename)))
     (if (file-exists-p abspath)
         abspath
       filename)))
diff --git a/telega-customize.el b/telega-customize.el
index 8393f0f..cb21465 100644
--- a/telega-customize.el
+++ b/telega-customize.el
@@ -678,7 +678,7 @@ In range [1..3].  Use 1."
   :prefix "telega-server-"
   :group 'telega)
 
-(defcustom telega-server-command "telega-server"
+(defcustom telega-server-command "@TELEGA_SERVER_BIN@"
   "Command to run as telega server.
 It should be absolute path or binary file searchable in `exec-path'."
   :type 'string
-- 
2.41.0
uix/commit/gnu/services/security-token.scm?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'>commit</a><a href='/guix/diff/gnu/services/security-token.scm?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/security-token.scm'>
<input type='hidden' name='id' value='3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'>root</a>/<a href='/guix/log/gnu?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'>gnu</a>/<a href='/guix/log/gnu/services?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'>services</a>/<a href='/guix/log/gnu/services/security-token.scm?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb'>security-token.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/security-token.scm?id=3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-22 00:31:41 +0100'>2023-12-22</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=3d6583727ec90732ad7bd97808fd4fca8f6d8bdc'>services: Remove unnecessary references to (gnu build shepherd).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/databases.scm (memcached-shepherd-service): Remove
‘with-imported-modules’ form and ‘modules’ field.
* gnu/services/security-token.scm (pcscd-shepherd-service): Remove
‘with-imported-modules’ form.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Likewise.

Change-Id: Ieb817508f1751e0c1ff551a0e078789a4a813c1c
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-25 01:43:08 +0530'>2022-06-25</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=037bfd85458dd0b32a6dd85b7c12e85e3dd716ae'>services: pcscd: Use switch-symlinks from (guix build utils).</a><span class='msg-avail'>...<span class='msg-tooltip'>switch-symlinks has been moved to (guix build utils). We need not duplicate it
anymore.

* gnu/services/security-token.scm (pcscd-activation): Use switch-symlinks
from (guix build utils).
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2021-07-03 20:13:42 +0200'>2021-07-03</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=e789ce538ed848bacb8f4eb5742f78b965ccf57c'>services: pcscd: Fix daemon signal handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>"pcscd" wouldn't handle SIGTERM as it inherit ignoring this signal (and
others) from its parent shepherd; fork+exec-command restore signal
handling.  Fixes &lt;https://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd)[start]: Use
fork+exec-command to start "pcscd".
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2021-06-19 23:49:18 +0200'>2021-06-19</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=4bed8486d4c0a4ff142903b8bc1584ce84767355'>services: pcscd: Cleanup socket when started.</a><span class='msg-avail'>...<span class='msg-tooltip'>Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL),
it won't start again because of it's socket already existing.

* gnu/services/security-token.scm (pcscd-shepherd-service)[start]:
Remove existing socket file.
</span></span></td><td>Brice Waegeneire</td></tr>