[isis] 13/25: ISIS-2062: more messing about with scripts

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 25ca1e84d5ff2055a9ebf51b3f4afef1dfda0366
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 13 18:40:19 2019 +0000

    ISIS-2062: more messing about with scripts
---
 scripts/ci/_adoc-antora.sh | 1 -
 scripts/ci/build-site.sh   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/ci/_adoc-antora.sh b/scripts/ci/_adoc-antora.sh
index c6f2106..cbac566 100644
--- a/scripts/ci/_adoc-antora.sh
+++ b/scripts/ci/_adoc-antora.sh
@@ -19,7 +19,6 @@ if [ ! -f "$PLAYBOOK" ]; then
   PLAYBOOK=site.yml
 fi
 
-PLAYBOOK=$PROJECT_ROOT_PATH/$PLAYBOOK
 echo "\$PLAYBOOK = $PLAYBOOK"
 
 if [ -z "$REVISION" ]; then
diff --git a/scripts/ci/build-site.sh b/scripts/ci/build-site.sh
index a082f76..8ffb9f1 100644
--- a/scripts/ci/build-site.sh
+++ b/scripts/ci/build-site.sh
@@ -21,7 +21,7 @@ if [ "$WC" -ne "0" ]; then
   exit 1
 fi
 
-bash $SCRIPT_DIR/_adoc-antora.sh $*
+bash $SCRIPT_DIR/_adoc-antora.sh ${PROJECT_ROOT_PATH}/$*
 
 # add a marker, that tells github not to use jekyll on the github pages folder
 touch ${PROJECT_ROOT_PATH}/antora/target/site/.nojekyll