Travis fixes for HonKit, take 2

.travis.yml

@@ -6,10 +6,18 @@ node_js:
   - "12"
 
 before_script:
-  - BOOK_BUILD_DIR="${TRAVIS_BUILD_DIR}"/_book
+  - export BOOK_BUILD_DIR="${TRAVIS_BUILD_DIR}"/_book
+  - env | sort
 
 script:
   - npm run build
+  # Make sure the book built.
+  - |
+      book_check_file="${BOOK_BUILD_DIR}/index.html"
+      if [[ ! -f  "${book_check_file}" ]]; then
+          echo "${book_check_file} not found"
+          exit 1
+      fi
 
 after_success:
     - |

tools/deploy/update_site_travis.bash

@@ -14,16 +14,16 @@ set -o errexit
 bold=$(tput bold)
 normal=$(tput sgr0)
 
-if [ -z ${DOCS_BRANCH_NAME+x} ]; then
+if [[ -z ${DOCS_BRANCH_NAME+x} ]]; then
     echo "${bold}\$DOCS_BRANCH_NAME is not set!${normal}"
     exit 1
-elif [ -z ${DOCS_REPO_NAME+x} ]; then
+elif [[ -z ${DOCS_REPO_NAME+x} ]]; then
     echo "${bold}\$DOCS_REPO_NAME is not set!${normal}"
     exit 1
-elif [ -z ${DOCS_REPO_OWNER+x} ]; then
+elif [[ -z ${DOCS_REPO_OWNER+x} ]]; then
     echo "${bold}\$DOCS_REPO_OWNER is not set!${normal}"
     exit 1
-elif [ -z ${GH_TOKEN+x} ]; then
+elif [[ -z ${GH_TOKEN+x} ]]; then
     echo "${bold}\$GH_TOKEN is not set!${normal}"
     exit 1
 fi
@@ -34,8 +34,18 @@ git config user.email "travis@travis-ci.org"
 GH_REPO_REF="github.com/${DOCS_REPO_OWNER}/${DOCS_REPO_NAME}.git"
 
 # Assume the book has already been built and lives in $BOOK_BUILD_DIR.
+book_check_file="${BOOK_BUILD_DIR}/index.html"
 
-if [ -d "${BOOK_BUILD_DIR}" ]; then
+if [[ ! -d "${BOOK_BUILD_DIR}" ]]; then
+    echo "" >&2
+    echo "${bold}Warning: The book directory wasn't found!${normal}" >&2
+    echo "${bold}Warning: Not going to push the book to GitHub!${normal}" >&2
+    exit 1
+elif [[ ! -f "${book_check_file}" ]]; then
+    echo "${bold}${book_check_file} not found!${normal}" >&2
+    echo "${bold}${BOOK_BUILD_DIR} is present though.${normal}" >&2
+    exit 1
+else
     echo "${bold}Cloning the website repo...${normal}"
     git clone -b "${DOCS_BRANCH_NAME}" https://git@"${GH_REPO_REF}"
     rm -rf ./"${DOCS_REPO_NAME}"/*
@@ -52,9 +62,4 @@ if [ -d "${BOOK_BUILD_DIR}" ]; then
         -m "Commit: ${TRAVIS_COMMIT}" || ret=$?
     git push "https://${GH_TOKEN}@${GH_REPO_REF}"
     popd
-else
-    echo "" >&2
-    echo "${bold}Warning: The book wasn't found!${normal}" >&2
-    echo "${bold}Warning: Not going to push the book to GitHub!${normal}" >&2
-    exit 1
 fi