From: Florian Schmaus <flow@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: tex@gentoo.org, Florian Schmaus <flow@gentoo.org>
Subject: [gentoo-dev] [PATCH] texlive-common.eclass: add newline between tlbobj entries in tlpdb
Date: Sun, 28 Apr 2024 10:40:00 +0200 [thread overview]
Message-ID: <20240428084001.32729-1-flow@gentoo.org> (raw)
We previously created the texlive.tlpdb by concatenating all tlpobj
files. This means that the entries will be right after another.
As it turns out, some TeX Live tools require a newline (e.g., tlmgr)
between the entries, while others do not (e.g., texdoc). And the
"official" tlpdb also has the entries separated by newlines. Therefore
this changes texlive-common_update_tlpdb() to also add them.
Signed-off-by: Florian Schmaus <flow@gentoo.org>
---
eclass/texlive-common.eclass | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index b32ea2af1121..929062c0444a 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -270,10 +270,18 @@ texlive-common_update_tlpdb() {
touch "${new_tlpdb}" || die
if [[ -d "${tlpobj}" ]]; then
- find "${tlpobj}" -maxdepth 1 -type f -name "*.tlpobj" -print0 |
- sort -z |
- xargs -0 --no-run-if-empty cat >> "${new_tlpdb}"
- assert "generating tlpdb failed"
+ all_tlpobjs() {
+ find "${tlpobj}" -maxdepth 1 -type f -name "*.tlpobj" -print0 |
+ sort -z
+ assert "Error enumerating all tlpobj files"
+ }
+ (
+ while IFS="" read -d $'\0' -r f; do
+ cat "${f}" || die "Failed to read ${f}"
+ # Ensure there is an empty line between every tlpobj entry.
+ echo
+ done < <(all_tlpobjs)
+ ) >> "${new_tlpdb}"
fi
if [[ -f ${tlpdb} ]]; then
--
2.43.2
next reply other threads:[~2024-04-28 8:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-28 8:40 Florian Schmaus [this message]
2024-04-28 12:13 ` [gentoo-dev] [PATCH] texlive-common.eclass: add newline between tlbobj entries in tlpdb Ulrich Mueller
2024-04-28 16:49 ` Florian Schmaus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240428084001.32729-1-flow@gentoo.org \
--to=flow@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
--cc=tex@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox