From 18c10ae5cc85730dfc0846a9955d60fdd7e785f4 Mon Sep 17 00:00:00 2001 From: peartown Date: Mar 13 2022 09:42:28 +0000 Subject: Specifying Antora version 3.0.0, if conditions changed to new format, proper quoting of variables in build.sh. If conditions changed to `uname | grep -iwq foo`, quoting used from https://pagure.io/fedora-docs/template. --- diff --git a/build.sh b/build.sh index 3e5dbea..5c7db89 100755 --- a/build.sh +++ b/build.sh @@ -3,16 +3,16 @@ image="docker.io/antora/antora:3.0.0" cmd="--html-url-extension-style=indexify site.yml" -if [ "$(uname)" == "Darwin" ]; then +if uname | grep -iwq 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 uname | grep -iq linux; then # Running on Linux. # Check whether podman is available, else faill back to docker # which requires root. @@ -21,7 +21,7 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; 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,18 +29,19 @@ 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 - else + 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 "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." + echo " See https://docs.docker.com/install/linux/linux-postinstall/." echo "" - sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd - fi + 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" - exit 1 + echo "Error: Container runtime haven't been found on your system. Fix it by:" + echo "$ sudo dnf install podman" + exit 1 fi fi