From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
Date: Fri, 14 Jun 2024 22:26:02 +0000 (UTC) [thread overview]
Message-ID: <1718403924.dc3715e54ff4f1549576cd25fb6abeaeb7f9ef11.chewi@gentoo> (raw)
commit: dc3715e54ff4f1549576cd25fb6abeaeb7f9ef11
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 22:25:24 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 22:25:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3715e5
games-action/descent2-data: Fix patching the CD readme file
Closes: https://bugs.gentoo.org/933992
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2-r1.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2-r1.ebuild b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
index 5b81d07228cc..8f19d07739b9 100644
--- a/games-action/descent2-data/descent2-data-1.2-r1.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
@@ -97,10 +97,14 @@ src_prepare() {
# Patch to 1.2 if necessary
if use cdinstall; then
if [[ $(md5sum data/descent2.ham) != 7f30c3d7d4087b8584b49012a53ce022* ]]; then
- local i
- for i in *.xdelta; do
- xdelta3 -d -s data/"${i%.*}" "${i}" data/"${i%.*}".new || die
- mv data/"${i%.*}"{.new,} || die
+ local x dir
+ for x in *.xdelta; do
+ case "${x}" in
+ *.txt.xdelta) dir=doc ;;
+ *) dir=data ;;
+ esac
+ xdelta3 -d -s "${dir}/${x%.*}" "${x}" "${dir}/${x%.*}.new" || die
+ mv "${dir}/${x%.*}"{.new,} || die
done
fi
fi
next reply other threads:[~2024-06-14 22:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-14 22:26 James Le Cuirot [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-28 10:00 [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/ Arthur Zamarin
2024-06-09 11:34 James Le Cuirot
2023-07-05 20:49 Conrad Kostecki
2022-11-22 14:00 Arthur Zamarin
2021-10-19 0:19 Sam James
2020-09-05 23:08 James Le Cuirot
2020-02-12 21:04 David Seifert
2018-09-16 9:34 James Le Cuirot
2017-12-18 9:33 James Le Cuirot
2017-12-10 21:41 Michał Górny
2017-04-27 21:41 James Le Cuirot
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=1718403924.dc3715e54ff4f1549576cd25fb6abeaeb7f9ef11.chewi@gentoo \
--to=chewi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.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