From a0e95a2c1b10da0f1581d60f1802d64d5ebe62cc Mon Sep 17 00:00:00 2001
From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Fri, 18 Aug 2017 02:52:03 +0200
Subject: [PATCH] generate_manuals_for_web: switch to xhtml, and use a random
 userdir while exporting, so no cached pic can be found.

---
 development/tools/generate_manuals_for_web.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/development/tools/generate_manuals_for_web.sh b/development/tools/generate_manuals_for_web.sh
index b28a638f7e..6984b1b1fa 100755
--- a/development/tools/generate_manuals_for_web.sh
+++ b/development/tools/generate_manuals_for_web.sh
@@ -22,13 +22,16 @@ MAIN_DOCS=${MAIN_DOCS:-"Intro Tutorial UserGuide Math Additional Customization S
 LYX=${LYX:-${PWD}/src/lyx}
 OUT=${OUT:-$HOME/web/lyxdoc}
 TOC=${TOC:-lyxdoc/index.html}
-TMP=${TMP:-$(mktemp -d)}
+TMP=${TMP:-$(mktemp -d --tmpdir lyx-docs-XXXX)}
+USERDIR=${USERDIR:-$(mktemp -d --tmpdir lyx-home-XXXX)}
 
 echo LYX=$LYX
 echo OUT=$OUT
 echo TOC=$TOC
 echo TMP=$TMP
 
+echo "Building docs: $MAIN_DOCS"
+
 mycpus=$(grep -c processor /proc/cpuinfo)
 function pexec {
     while [ $(pidof lyx | wc -w) -ge $[$mycpus*15/10] -o $(pidof lyx | wc -w) -ge $[$mycpus*15/10] ]; do
@@ -70,22 +73,22 @@ EOF
 for m in $MAIN_DOCS; do
     echo "<tr><td>$m</td><td>" >> $TOC
     find . -name $m.lyx | while read f; do
-	if [ ! -f lyxdoc/${f%%.lyx}.html.LyXconv/$m.html ]; then
-	    pexec $LYX -E xhtml lyxdoc/${f%%.lyx}.html $f;
+	if [ ! -f lyxdoc/${f%%.lyx}.xhtml ]; then
+	    pexec $LYX -userdir $USERDIR -E xhtml lyxdoc/${f%%.lyx}.xhtml $f;
 	else
-	    echo "Skipping already existing lyxdoc/${f%%.lyx}.html"
+	    echo "Skipping already existing lyxdoc/${f%%.lyx}.xhtml"
 	fi
 	if echo $f | grep '/[a-zA-Z_]\+/' > /dev/null 2>&1; then
 	    lang=$(echo $f | sed -e 's#.*/\([a-zA-Z_]\+\)/.*#\1#')
 	else
 	    lang=en
 	fi
-	echo "<a href=\"${f%%.lyx}.html\">[$lang]</a>" >> $TOC
+	echo "<a href=\"${f%%.lyx}.xhtml\">[$lang]</a>" >> $TOC
     done
     echo "</td><td>" >> $TOC
     find . -name $m.lyx | while read f; do
 	if [ ! -f lyxdoc/${f%%.lyx}.pdf ]; then
-	    pexec $LYX -E pdf lyxdoc/${f%%.lyx}.pdf $f;
+	    pexec $LYX -userdir $USERDIR -E pdf lyxdoc/${f%%.lyx}.pdf $f;
 	else
 	    echo "Skipping already existing lyxdoc/${f%%.lyx}.pdf"
 	fi