From c0c064469dc703e38908f435fe56b8fddb82df02 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 22 Aug 2016 11:33:07 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- ghpages.sh | 5 +++-- spring-cloud-cli.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ghpages.sh b/ghpages.sh index 6a6363b..57c5da3 100644 --- a/ghpages.sh +++ b/ghpages.sh @@ -32,7 +32,7 @@ function check_if_anything_to_sync() { exit 0 fi - if ! [ -d docs/target/generated-docs ]; then + if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then echo "No gh-pages sources in docs/target/generated-docs, so not syncing" exit 0 fi @@ -101,12 +101,13 @@ function add_docs_from_target() { local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static if [[ ! -e "${clonedStatic}/.git" ]]; then echo "Cloning Spring Cloud Static to target" - git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} + git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && git checkout gh-pages else echo "Spring Cloud Static already cloned - will pull changes" cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages fi DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME} + mkdir -p ${DESTINATION_REPO_FOLDER} else if [[ ! -e "${DESTINATION}/.git" ]]; then echo "[${DESTINATION}] is not a git repository" diff --git a/spring-cloud-cli.html b/spring-cloud-cli.html index 5388ce3..fb8323a 100644 --- a/spring-cloud-cli.html +++ b/spring-cloud-cli.html @@ -675,7 +675,7 @@ AQAjPgt3eFZQXwt8tsHAVv/QHiY5sI2dRcR+...