[docs] Shuffling code around in deploy-docs.sh

Temporarily makes it rebuild docs on every change again.

.ci/deploy-docs.sh

@@ -1,27 +1,35 @@
-TAG="$(git describe --exact-match --match "[0-9]*" HEAD 2>/dev/null)"
 
 set -o errexit -o nounset
 
-if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" -a "$TRAVIS_SECURE_ENV_VARS" == "true" -a "$TAG" != "" ]
+if [ "$TRAVIS_OS_NAME" != "linux" -o "$CC" != "gcc" -o "$TRAVIS_SECURE_ENV_VARS" != "true" ]; then
-then
+	exit
-	DOCSDIR=build-docs
+fi
+
+BRANCH="$(TRAVIS_BRANCH)"
+TAG="$(git describe --exact-match --match "[0-9]*" HEAD 2>/dev/null)"
+
+if [ "x$TAG" == x ]; then
 	REVISION=$(git rev-parse --short HEAD)
+else
+	REVISION=$TAG
+fi
 
-	rm -rf $DOCSDIR || exit
+DOCSDIR=build-docs
-	mkdir $DOCSDIR
-	cd $DOCSDIR
 
-	cp ../docs/html/* .
+rm -rf $DOCSDIR || exit
+mkdir $DOCSDIR
+cd $DOCSDIR
 
-	git init
+cp ../docs/html/* .
-	git config user.name "Travis CI"
-	git config user.email "travis@harfbuzz.org"
-	git remote add upstream "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG.git"
-	git fetch upstream
-	git reset upstream/gh-pages
 
-	touch .
+git init
-	git add -A .
+git config user.name "Travis CI"
-	git commit -m "Rebuild docs for $REVISION"
+git config user.email "travis@harfbuzz.org"
-	git push -q upstream HEAD:gh-pages
+git remote add upstream "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG.git"
-fi
+git fetch upstream
+git reset upstream/gh-pages
+
+touch .
+git add -A .
+git commit -m "Rebuild docs for $REVISION"
+git push -q upstream HEAD:gh-pages