From 1934651b93cda92207429ac91b964cff220c76d5 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Fri, 1 Mar 2024 13:56:45 +0100 Subject: [PATCH] dodoc: Skip a file if a compressed version already exists This prevents that __prepdoc() also adds the uncompressed version of a default doc file if src_install() installed the compressed version. Also add missing documentation about the handling of FILE.md, FILE.rst and FILE.txt. --- lib/src_install.cygpart | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/src_install.cygpart b/lib/src_install.cygpart index 481457dc..7aca673c 100644 --- a/lib/src_install.cygpart +++ b/lib/src_install.cygpart @@ -162,9 +162,12 @@ docinto() { # DESCRIPTION # Installs the given files or directories into $D/usr/share/doc/PN/, or a # subdirectory thereof specified by the previous call to docinto. +# If a FILE does not exist, FILE.md, FILE.rst and FILE.txt are also +# considered. A FILE is skipped if the destination file or a compressed +# version (.bz2, .gz, .xz, .zstd) of it already exists. #**** dodoc() { - local docdir d f i x + local docdir d e f i x case "${_docinto_dir}" in '') docdir=/usr/share/doc/${PN} ;; @@ -191,6 +194,10 @@ dodoc() { do if [ -s "${i}${x}" -a ! -f "${D}${docdir}/${i}${x}" ] then + for e in bz2 gz xz zst + do + ! [ -f "${D}${docdir}/${i}${x}.${e}" ] || continue 2 + done __doinstall 0644 "${i}${x}" ${docdir} || error "dodoc ${i} failed" break fi -- 2.43.0