From 7ebe33ebc8d72591acb05daa1c83d70d7ed24e98 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Mar 09 2022 15:23:19 +0000 Subject: Fix build/preview scripts --- diff --git a/build.sh b/build.sh index 21c0325..87daa14 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" @@ -8,25 +8,24 @@ if uname | grep -iwq darwin; then # 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 "This build script is using Docker 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 uname | grep -iq linux; then # Running on Linux. - # there isn't an antora/aarch64 container, antora can be installed locally - # Check whether podman is available, else faill back to docker + # Let's assume that it's running the Docker deamon # which requires root. if [ -f /usr/local/bin/antora ]; then - /usr/local/bin/antora "${cmd}" + /usr/local/bin/antora ${cmd} elif uname -m | grep -iwq aarch64; then - echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" + 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 "" @@ -34,19 +33,19 @@ elif uname | grep -iq 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 "You might be asked for your password." echo "You can avoid this by adding your user to the 'docker' group," echo "but be aware of the security implications." echo "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 "" - echo "Error: Container runtime haven't been found on your system. Fix it by:" - echo "$ sudo dnf install podman" + echo "Error: Container runtime has not been found on your system. Fix it by running this command:" + echo "sudo dnf install podman" exit 1 fi fi diff --git a/preview.sh b/preview.sh index 4270107..05f8455 100755 --- a/preview.sh +++ b/preview.sh @@ -5,7 +5,7 @@ if [ "$(uname)" = "Darwin" ]; then # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "The preview will be available at http://localhost:8080/" - docker run --rm -v "$(pwd):/antora:ro" -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro" -p 8080:80 nginx + docker run --rm -v $(pwd):/antora:ro -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro -p 8080:80 nginx elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then # Running on Linux.