Fix doc deployment problems (see PR #201)

Author: zbeekman

deploy.sh

@@ -11,26 +11,27 @@ if [ "$TRAVIS" ]; then #running under travis
 	if [ "$TRAVIS_BRANCH" = "master" ] && \
 	       [ "$TRAVIS_PULL_REQUEST" = "false" ] && \
 	       [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
-            git clone --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages
+            git clone -q --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages >/dev/null 2>&1
             cd gh-pages || exit 1
-	    rm -r css favicon.png fonts index.html interface js lists media module page proc \
-	       program search.html sourcefile src tipuesearch type
+	    rm -rf -- css fonts interface lists module proc search.html	src type favicon.png index.html \
+	       js media page program sourcefile	tipuesearch || true
 	    cp -r "$TRAVIS_BUILD_DIR"/doc/* .
-            git add -A # Add all the new files
-            git commit -m "Development documentation updated by travis job $TRAVIS_JOB_NUMBER for commits $TRAVIS_COMMIT_RANGE"
-            git push origin gh-pages
+            git add -A || true # Add all the new files
+            git commit -m "Development documentation updated by travis job $TRAVIS_JOB_NUMBER for commits $TRAVIS_COMMIT_RANGE" || true
+            git push -fq origin gh-pages > /dev/null 2>&1 || true
 	fi
 	# If publishing a new/updated tag, deploy it's documentation
 	if [ "$TRAVIS_TAG" ] && [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
 	    cd "$TRAVIS_BUILD_DIR" || exit 1
-	    git clone --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages
-	    sed "1 s/^/version: ${TRAVIS_TAG}\n/" json-fortran.md > json-fortran.tagged.md
+	    git clone -q --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages >/dev/null 2>&1
+	    sed "2 s/^/version: ${TRAVIS_TAG}\n/" json-fortran.md > json-fortran.tagged.md
+	    head json-fortran.tagged.md # Debug output
 	    # rebuild FORD documentation without pages, with version info, wiping out any existing tag folder
-	    ford -o "gh-pages/$TRAVIS_TAG" json-fortran.tagged.md
+	    ford --debug -o "gh-pages/$TRAVIS_TAG" json-fortran.tagged.md
 	    cd gh-pages || exit 1
 	    git add -A # add all new files in $TRAVIS_TAG/
 	    git commit -m "Tag/release documentation updated by travis job $TRAVIS_JOB_NUMBER for tag $TRAVIS_TAG $TRAVIS_COMMIT"
-	    git push origin gh-pages
+	    git push -f -q origin gh-pages >/dev/null 2>&1
 	fi
     fi
 fi