From 058ff226049a97b1e50098528784fbbf314aaefc Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Jun 2020 12:35:06 +0200
Subject: [PATCH] Update doc-deploy file

---
 docs/Makefile  |  5 +++--
 docs/deploy.sh | 13 +++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 219e56c1c7..09ce5533fe 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -31,7 +31,8 @@ help:
 	@echo "  $(cblue)clean$(cnorm)       to remove remnants of a previous build"
 	@echo "  $(cblue)local$(cnorm)       to build local html docs of the current branch (no multiversion)."
 	@echo "  $(cblue)mv-local$(cnorm)    to build multiversion html docs, without deploying (req. local git commit)"
-	@echo "  $(cblue)release$(cnorm)     to build and deploy multiversion docs online (req. commit and github push access)"
+	@echo "  $(cblue)deploy$(cnorm)      to deploy previously built multiversion docs online (req. commit and github push access)"
+	@echo "  $(cblue)release$(cnorm)     to build + deploy multiversion docs online (req. commit and github push access)"
 
 
 .PHONY: help Makefile
@@ -115,6 +116,6 @@ deploy:
 # build and prepare the docs for release
 release:
 	make mv-local
-	# make _mv-deploy
+	make deploy
 	@echo ""
 	@echo "Deployment complete."
diff --git a/docs/deploy.sh b/docs/deploy.sh
index 39f012c453..961f75e634 100644
--- a/docs/deploy.sh
+++ b/docs/deploy.sh
@@ -18,20 +18,17 @@ git checkout gh-pages
 # remove all but the build dir
 ls -Q | grep -v build | xargs rm -Rf
 
-cp -Rf build/html/versions/* .
-# docs/build is in .gitignore so will not be included
-git add .
-
+cp -Rf build/html/* .
 # TODO automate this? 
 ln -s 1.0-dev latest
 
-git add docs/*
+# docs/build is in .gitignore so will not be included
+git add .
+
 git commit -a -m "Updated HTML docs"
 
-mv build docs/
-
 echo "Skipping deployment"
-# git push origin gh-pages
+git push origin gh-pages
 
 # get back to previous branch 
 git checkout -