Regular merge of develop

.ci/deploy.sh

@@ -17,6 +17,11 @@ else
     version="unstable";
 fi
 
+# add matomo
+sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html
+sed -i "/matomopolicy/r./.ci/analytics/policy.html" theme/templates/_index.html
+sed -i "/matomobanner/r./.ci/analytics/gdpr-banner.html" theme/templates/_index.html
+
 # loop through all the presentations
 nBlades=0
 for d in $(find . -maxdepth 1 -type d)
@@ -47,18 +52,6 @@ do
                 ln -s ../../theme/package.json package.json
                 ln -s ../../theme theme
 
-                # reset the theme
-                cd $rootDir
-                cd theme
-                git checkout -- templates/_index.html
-                cd $BLADE
-                echo " > Theme reset."
-
-                # add matomo
-                sed -i "/matomohead/r./../../.ci/analytics/head.html" theme/templates/_index.html
-                sed -i "/matomopolicy/r./../../.ci/analytics/policy.html" theme/templates/_index.html
-                sed -i "/matomobanner/r./../../.ci/analytics/gdpr-banner.html" theme/templates/_index.html
-
                 # install npm
                 yarn global add grunt-cli generator-reveal
                 yarn install