From 036f979167a4a3ebfbc7ce8aa004439c00e99848 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 12 Dec 2023 16:49:13 +0100 Subject: [PATCH] Rename EPUB to OpenPGP_for_application_developers.epub Fix link provided on website. Signed-off-by: David Runge --- Dockerfile | 2 +- README.md | 2 +- book/Makefile | 2 +- book/source/conf.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5cca0cd..020653e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,4 @@ RUN \ FROM scratch COPY --from=build /book/build/html / -COPY --from=build /book/build/epub/OpenPGPforapplicationdevelopers.epub / +COPY --from=build --chown=644 /book/build/epub/OpenPGP_for_application_developers.epub / diff --git a/README.md b/README.md index 8c4538a..e4f1f7f 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ A book for application developers who want to integrate OpenPGP functionality in This book serves a standalone introduction to the concepts of OpenPGP. It also introduces readers to the [OpenPGP RFC](https://datatracker.ietf.org/doc/draft-ietf-openpgp-crypto-refresh/). -Current draft version: [html](https://openpgp.codeberg.page/test/), [epub](https://openpgp.codeberg.page/test/OpenPGPforapplicationdevelopers.epub). \ No newline at end of file +Current draft version: [html](https://openpgp.codeberg.page/test/), [epub](https://openpgp.codeberg.page/test/OpenPGP_for_application_developers.epub). diff --git a/book/Makefile b/book/Makefile index d1e55d2..6b598c1 100644 --- a/book/Makefile +++ b/book/Makefile @@ -37,7 +37,7 @@ epub-check: clean epub # use watchexec to rebuild the EPUB whenever a markdown file changes # this target kills *any* open instance of calibre's ebook-viewer, that is currently showing OpenPGPforapplicationdevelopers.epub epub-watch: - @$(WATCHEXEC) --shell bash -e css,html,j2,md,py,svg 'make clean epub && ev_pid="$$(pgrep -af "^python3.*ebook-viewer.*OpenPGPforapplicationdevelopers" | cut -f1 -d " ")" && if [[ -n "$$ev_pid" ]]; then kill -9 "$$ev_pid"; fi && $(EBOOK_VIEWER) $(BUILDDIR)/epub/OpenPGPforapplicationdevelopers.epub &' + @$(WATCHEXEC) --shell bash -e css,html,j2,md,py,svg 'make clean epub && ev_pid="$$(pgrep -af "^python3.*ebook-viewer.*OpenPGP_for_application_developers" | cut -f1 -d " ")" && if [[ -n "$$ev_pid" ]]; then kill -9 "$$ev_pid"; fi && $(EBOOK_VIEWER) $(BUILDDIR)/epub/OpenPGP_for_application_developers.epub &' # Put it first so that "make" without argument is like "make help". help: diff --git a/book/source/conf.py b/book/source/conf.py index 48e0bb7..69e5bc7 100644 --- a/book/source/conf.py +++ b/book/source/conf.py @@ -61,7 +61,7 @@ epub_cover = ('_static/epub/img/cover.svg', 'cover.j2') epub_css_files = [ 'epub/css/custom.css' ] -epub_title = project.replace(" ", "_") +epub_basename = project.replace(" ", "_") # -- Options for HTML output ------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output @@ -83,7 +83,7 @@ html_theme_options = { 'code_font_size': '9pt', 'extra_nav_links': { 'Sources on Codeberg': upstream_url, - 'Download EPUB': f'https://openpgp.dev/epub/{epub_title}.epub', + 'Download EPUB': f'https://openpgp.dev/book/{epub_basename}.epub', }, 'show_relbars': 'yes', 'show_powered_by': False,