diff --git a/docs/pom.xml b/docs/pom.xml index 74e62a78..1341c5d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -29,29 +29,13 @@ maven-deploy-plugin 2.8.2 - - exec-maven-plugin - org.codehaus.mojo - - - Run tests - test - - exec - - - ${basedir}/src/test/bash/run-bats.sh - - - - docs - + org.apache.maven.plugins maven-dependency-plugin @@ -71,5 +55,35 @@ + + unix + + + unix + Linux + + + + + + exec-maven-plugin + org.codehaus.mojo + + + Run tests + test + + exec + + + ${skipTests} + ${basedir}/src/test/bash/run-bats.sh + + + + + + + diff --git a/docs/src/test/bash/build-helper.sh b/docs/src/test/bash/build-helper.sh index df46e940..818c58e6 100755 --- a/docs/src/test/bash/build-helper.sh +++ b/docs/src/test/bash/build-helper.sh @@ -20,25 +20,13 @@ if [[ $# -ne 1 ]]; then usage fi -function shellcheck_installed() { - shellcheck --version && return 0 || return 1 -} - SHELLCHECK_VERSION="v0.6.0" -SHELLCHECK_INSTALLED="$( shellcheck_installed && echo "true" || echo "false" )" -echo "Shellcheck installed? [${SHELLCHECK_INSTALLED}]" -if [[ "${SHELLCHECK_INSTALLED}" != "false" ]]; then - SHELLCHECK_BIN="shellcheck" -else - SHELLCHECK_BIN="${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" -fi -echo "Shellcheck binary location [${SHELLCHECK_BIN}]" +SHELLCHECK_BIN="${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" case $1 in download-shellcheck) - if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" && "${SHELLCHECK_INSTALLED}" == "false" ]]; then + if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" ]]; then SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" - SHELLCHECK_ARCHIVE_SHA512SUM="d88733e95aea8e970c373a3f677a3eb272f14c12d3e9c93f81463b5fe406b43acdd3046d10c092f40c070a96a5fac1cf7e18b35ed790d76ecced6af32e2c8a85" if [[ -x "${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" ]]; then echo "shellcheck already downloaded - skipping..." exit 0 @@ -46,24 +34,18 @@ case $1 in wget -P "${ROOT_DIR}/../target/" \ "https://storage.googleapis.com/shellcheck/${SHELLCHECK_ARCHIVE}" pushd "${ROOT_DIR}/../target/" - echo "${SHELLCHECK_ARCHIVE_SHA512SUM} ${SHELLCHECK_ARCHIVE}" | sha512sum -c - tar xvf "${SHELLCHECK_ARCHIVE}" rm -vf -- "${SHELLCHECK_ARCHIVE}" popd else - if [[ "${SHELLCHECK_INSTALLED}" == "false" ]]; then - echo "It seems that automatic installation is not supported on your platform." - echo "Please install shellcheck manually:" - echo " https://github.com/koalaman/shellcheck#installing" - exit 1 - fi + echo "It seems that automatic installation is not supported on your platform." + echo "Please install shellcheck manually:" + echo " https://github.com/koalaman/shellcheck#installing" + exit 1 fi ;; run-shellcheck) echo "Running shellcheck" - if [[ "${SHELLCHECK_INSTALLED}" != "false" ]]; then - SHELLCHECK_BIN="shellcheck" - fi "${SHELLCHECK_BIN}" "${ROOT_DIR}"/src/main/asciidoc/*.sh echo "Shellcheck passed sucessfully!" ;;