cronjob file

Makefile

@@ -106,25 +106,23 @@ zip:
 	mv $(BUILDDIR)/html/QGIS-$(VERSION)-Documentation-$(LANG).zip $(BUILDDIR)/zip/;
 
 site: html zip
-	rsync -az $(BUILDDIR)/html/$(LANG) $(SITEDIR)/;
+	rsync -hvrzc --delete --progress $(BUILDDIR)/html/$(LANG) $(SITEDIR)/;
 
-
-full: springclean html zip
+full: html zip
 	make LANG=$(LANG) pdf;
 
-
 # this will build ALL languages, AND tries to rsync them to the web dir on qgis2
 # to be able to run this you will need a key on the server
 all: springclean
 	@for LANG in $(LANGUAGES) ; do \
 		make LANG=$$LANG site; \
 	done
-	rsync -az $(BUILDDIR)/zip $(SITEDIR)/;
+	rsync -hvrzc $(BUILDDIR)/zip $(SITEDIR)/;
 
 	@for LANG in $(LANGUAGES) ; do \
 		make LANG=$$LANG pdf; \
 	done
-	rsync -az $(BUILDDIR)/pdf $(SITEDIR)/;
+	rsync -hvrzc $(BUILDDIR)/pdf $(SITEDIR)/;
 
 # this will pull ALL translations (or at least from the languages we build for)
 # to your local disk, so it can be committed into github

cronjob.sh

@@ -15,13 +15,13 @@ fi
 touch running
 trap "rm $PWD/running" EXIT
 
-# throw away building artefacts
+# throw away building artefacts or edits(!)
 git stash
 git stash drop
-# get latest version
+# get latest version from github
 git pull
 
-docker run -v $PWD:/build -v /var/www/qgisdata/QGIS-Documentation/live/html:/site -w="/build" --rm=true --name="qgis_docs_master_build" qgis/sphinx_pdf_3 make site
+docker run -v $PWD:/build -v /var/www/qgisdata/QGIS-Documentation/live/html:/site -w="/build" --rm=true --name="qgis_docs_master_build" qgis/sphinx_pdf_3 make all
 
 now=`date`
 echo "Finished: $now"