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
6'>commit</a><a href='/guix/diff/gnu/tests/data?id=e6403a56716c6fc150e001f93419077afdda1b76'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/data'>
<input type='hidden' name='id' value='e6403a56716c6fc150e001f93419077afdda1b76'/><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=e6403a56716c6fc150e001f93419077afdda1b76'>root</a>/<a href='/guix/log/gnu?id=e6403a56716c6fc150e001f93419077afdda1b76'>gnu</a>/<a href='/guix/log/gnu/tests?id=e6403a56716c6fc150e001f93419077afdda1b76'>tests</a>/<a href='/guix/log/gnu/tests/data?id=e6403a56716c6fc150e001f93419077afdda1b76'>data</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/tests/data?id=e6403a56716c6fc150e001f93419077afdda1b76&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-08-02 17:23:30 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/tests/data?id=10f554700c417b84c22c56fdd007567a52c45d75'>Reinstate "services: Add a service for Jami."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted
commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below.

Thanks to Christopher Baines for reporting the failure and proposing a fix.

* guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data
files via the 'extra-files' argument.
* gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat
file to...
* gnu/local.mk (MODULES_NOT_COMPILED): ... here.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-08-02 15:48:59 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/tests/data?id=4673f817938d9d2b1b40a072ab2e0c44a32ccc97'>Revert "services: Add a service for Jami."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b.  It broke 'guix
pull'.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-08-02 15:15:02 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/tests/data?id=69dcc24c9f0cdfea674eb690e7755d26a25ced2b'>services: Add a service for Jami.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/telephony.scm (string-or-computed-file?)
(string-list?, account-fingerprint-list?): New procedures.
(maybe-string-list, maybe-account-fingerprint-list)
(maybe-boolean, maybe-string, jami-account-list): New configuration field
types.
(serialize-string-list, serialize-boolean, serialize-string)
(jami-account, jami-account-&gt;alist, jami-configuration)
(jami-account-list?, jami-account-list-maybe): New procedures.
(%jami-accounts): New variable.
(jami-configuration-&gt;command-line-arguments): New procedure.
(jami-dbus-session-activation, jami-shepherd-services): New procedures.
(jami-service-type): New variable.
* gnu/build/jami-service.scm: New file.
* gnu/tests/data/jami-dummy-account.dat: Likewise.
* gnu/tests/telephony.scm: Likewise.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register them.
* Makefile.am (SCM_TESTS): Register the test file.
(dist_patch_DATA): Register the new data file.
* doc/guix.texi (Telephony Services): Document it.
</span></span></td><td>Maxim Cournoyer</td></tr>