From 990f3bcca372056d68a96a0a919ccc212f99d0b2 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Thu, 18 Aug 2016 12:45:18 +0200
Subject: [PATCH] Reverting back to previous logic of docs copying

---
 docs/src/main/asciidoc/ghpages.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh
index 8781290d..93d66227 100755
--- a/docs/src/main/asciidoc/ghpages.sh
+++ b/docs/src/main/asciidoc/ghpages.sh
@@ -116,30 +116,40 @@ function add_docs_from_target() {
 function copy_docs_for_current_version() {
     if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
         echo -e "Current branch is master - will copy the current docs only to the root folder"
-        for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
+        for f in docs/target/generated-docs/*; do
             file=${f#docs/target/generated-docs/*}
-            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
+            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
                 # Not ignored...
                 cp -rf $f ${ROOT_FOLDER}/
-                git add -A $file
+                git add -A ${ROOT_FOLDER}/$file
             fi
         done
         COMMIT_CHANGES="yes"
     else
-        local destination=${ROOT_FOLDER}/${CURRENT_BRANCH}
-        mkdir -p ${destination}
         echo -e "Current branch is [${CURRENT_BRANCH}]"
         # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
         if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
             echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
-            for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
-                file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
-                copy_docs_for_branch ${file} ${destination}
+            for f in docs/target/generated-docs/*; do
+                file=${f#docs/target/generated-docs/*}
+                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+                    # Not ignored...
+                    # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
+                    if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
+                        # We don't want to copy the spring-cloud-sleuth.html
+                        # we want it to be converted to index.html
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                    else
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file
+                    fi
+                fi
             done
             COMMIT_CHANGES="yes"
         else
-            echo "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
-             [docs] module available under [docs] profile. Will not commit any changes to gh-pages for this branch."
+            echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
+             [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
         fi
     fi
 }