From 5073d09fe85ae36687f243e674d7c9fb362a0f81 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jan 12 2022 22:52:13 +0000 Subject: build.sh: Update with latest version from template --- diff --git a/build.sh b/build.sh index f4ecfe4..ed6fd2f 100755 --- a/build.sh +++ b/build.sh @@ -3,25 +3,30 @@ image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" -if [ "$(uname)" = "Darwin" ]; then +if [ "$(uname)" == "Darwin" ]; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "" echo "This build script is using Docker container runtime to run the build in an isolated environment." echo "" - docker run --rm -it -v "$(pwd):/antora" $image $cmd + docker run --rm -it -v $(pwd):/antora $image $cmd -elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then +elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. - # Check whether podman is available, else fall back to docker + # there isn't an antora/aarch64 container, antora can be installed locally + # Check whether podman is available, else faill back to docker # which requires root. - if [ -f /usr/bin/podman ]; then + if [ -f /usr/local/bin/antora ]; then + /usr/local/bin/antora $cmd + elif [[ `uname -m` == "aarch64" ]]; then + echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" + elif [ -f /usr/bin/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 + podman run --rm -it -v $(pwd):/antora:z $image $cmd elif [ -f /usr/bin/docker ]; then echo "" @@ -29,13 +34,13 @@ elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then echo "" if groups | grep -wq "docker"; then - docker run --rm -it -v "$(pwd):/antora:z" $image $cmd + docker run --rm -it -v $(pwd):/antora:z $image $cmd else echo "" echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." echo "" - sudo docker run --rm -it -v "$(pwd):/antora:z" $image $cmd + sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd fi else echo ""