From 713d2378936dae5a8689a49efa642e6562394b9e Mon Sep 17 00:00:00 2001 From: Peter Boy Date: Wed, 9 Aug 2023 12:52:15 +0200 Subject: [PATCH] Updated tools to docsbuilder, fixed some typos. --- build.sh | 4 +++- builder.sh => docsbuilder.sh | 4 ++-- modules/ROOT/nav.adoc | 2 +- modules/ROOT/pages/screencast-apps-comparison.adoc | 2 +- nginx.conf | 14 ++++++++++++++ preview.sh | 4 +++- 6 files changed, 24 insertions(+), 6 deletions(-) rename builder.sh => docsbuilder.sh (99%) create mode 100644 nginx.conf diff --git a/build.sh b/build.sh index 6655313..8b3a8ca 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,5 @@ #!/bin/bash -echo "Deprecated. Use the builder.sh script instead" +echo "Deprecated. Use the docsbuilder.sh script instead" +sleep 2 +./docsbuilder.sh -b diff --git a/builder.sh b/docsbuilder.sh similarity index 99% rename from builder.sh rename to docsbuilder.sh index 073b2bc..418b7e3 100755 --- a/builder.sh +++ b/docsbuilder.sh @@ -77,13 +77,13 @@ build () { # Check whether podman is available, else faill back to docker # which requires root. - if [ -f /usr/bin/podman ]; then + if [ -n "$(command -v podman)" ]; then echo "" echo "This build script is using Podman to run the build in an isolated environment." echo "" podman run --rm -it -v $(pwd):/antora:z $image $cmd --stacktrace - elif [ -f /usr/bin/docker ]; then + elif [ -n "$(command -v docker)" ]; then echo "" echo "This build script is using Docker to run the build in an isolated environment." echo "" diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index 8d88c43..cf07cbd 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -74,7 +74,7 @@ ** xref:using-yubikeys.adoc[Using Yubikeys with Fedora] ** xref:debug-systemd-problems.adoc[How to debug systemd problems] ** xref:enable-touchpad-click.adoc[How to enable touchpad click] -** xref:screencast-apps-comparison.adoc[ScreenCast – Compasison of Applications and how to use them] +** xref:screencast-apps-comparison.adoc[ScreenCast – Comparison of Applications and How to Use them] ** Jitsi *** xref:getting_started_with_jitsi.adoc[Getting started with Jitsi] *** xref:installing_jitsi.adoc[Installing Jitsi] diff --git a/modules/ROOT/pages/screencast-apps-comparison.adoc b/modules/ROOT/pages/screencast-apps-comparison.adoc index ce292bd..bc9c0a0 100644 --- a/modules/ROOT/pages/screencast-apps-comparison.adoc +++ b/modules/ROOT/pages/screencast-apps-comparison.adoc @@ -2,7 +2,7 @@ Ankursinha; Brunovernay; Hhlp :revnumber: unknown :revdate: 2021-02-14 -:category: Multimedie +:category: Multimedia :tags: How-to Screen-casting //:page-aliases: diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..f7093b3 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,14 @@ +server { + listen 80; + server_name localhost; + + location / { + root /antora/public; + index index.html index.htm; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/preview.sh b/preview.sh index 6655313..09dc4cc 100755 --- a/preview.sh +++ b/preview.sh @@ -1,3 +1,5 @@ #!/bin/bash -echo "Deprecated. Use the builder.sh script instead" +echo "Deprecated. Use the docsbuilder.sh script instead" +sleep 2 +./docsbuilder.sh -p