wiki: preview: misc. cleanup and robustification

5 files changed, 35 insertions, 29 deletions

diff --git a/wiki/preview.mdwn b/wiki/preview.mdwn
index 91551d0..73150fa 100644
--- a/wiki/preview.mdwn
+++ b/wiki/preview.mdwn
@@ -4,7 +4,7 @@ To preview just the markdown portions, install `markdown` and run something like
 
     markdown file_to_preview.mdwn
 
-For preview more sophisticated Ikiwiki and template features, we'll need some additional infrastructure:
+To preview more sophisticated Ikiwiki and template features, we'll need some additional infrastructure:
 
     curl -o ~/bin/ikiwiki-fdo-mangler.pl http://wiki.freedesktop.org/sitewranglers/wiki/preview/ikiwiki-fdo-mangler.pl
     gpg --verify <(curl -s http://wiki.freedesktop.org/sitewranglers/wiki/preview/ikiwiki-fdo-mangler.pl.asc) ~/bin/ikiwiki-fdo-mangler.pl && chmod a+x ~/bin/ikiwiki-fdo-mangler.pl
@@ -20,3 +20,7 @@ To preview a temporary simple Ikiwiki rendering of a file, relying on configurat
 To preview a persistent full Ikiwiki rendering of the whole repository, relying only on configuration from wiki.freedesktop.org on the first run:
 
     ikiwiki-fdo-preview-full.sh optional_relative_path/to_file.mdwn
+
+You may wish to edit `ikiwiki-fdo-preview-full.sh` to move the persistent directory out of `/tmp`.
+
+Only tested on Debian; patches welcome.
diff --git a/wiki/preview/ikiwiki-fdo-preview-full.sh b/wiki/preview/ikiwiki-fdo-preview-full.sh
index 8021130..0b83bcc 100644
--- a/wiki/preview/ikiwiki-fdo-preview-full.sh
+++ b/wiki/preview/ikiwiki-fdo-preview-full.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-#set -xe
+#set -x
+set -e
 
 REPO=$(git remote -v show | grep freedesktop.org | head -n 1 | perl -pe 's~.+/(.+) .+~\1~')
 
diff --git a/wiki/preview/ikiwiki-fdo-preview-full.sh.asc b/wiki/preview/ikiwiki-fdo-preview-full.sh.asc
index 2ad559d..4bbba6b 100644
--- a/wiki/preview/ikiwiki-fdo-preview-full.sh.asc
+++ b/wiki/preview/ikiwiki-fdo-preview-full.sh.asc
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
-iQIcBAABAgAGBQJRdfJPAAoJEN+cO+D+7b7vOrYP/j/nxJzzESp5wL4TPyjSPIf4
-KDi8KByiJUCwLRBnhHbexxzAxiHOE6ouPXVflg1RXzJYz5Layyrtcg6H1WfzodMb
-hYU8ZllJLBX8o5bwYXMV+NpJU8nM9kVYBl+hO7N73slnniEclAssnUaHr/akn47W
-wGO9Y1FEEWgjgseA4PDqk1x2J4vjIWxrX9zoXHrCP0A5rR+/6rLo6SVXBw/N6W9n
-rLM+iRZ9ACTH4yB1yY6YGpYZukIZQ39k47gJDQ0SwPYCJrMp3Br5mG/as0fmHmDn
-uSfntj6ZiOg22JJHC1EsFVT7pA83a4w6BTKQyAQcmltnFcI6tFu1n+plAGGRBjJL
-7RBtIjJ8yHtGIDQZNyu585e/nQ1KM1K0QpJnUl6J/j7DZkTIRXOnU73Ax2bBzDtG
-jQW3A7Yv1WeT0LY39+R/8nZ0aQStc9oPq1sQNLV8wTJvTeEMwOZhgwFsglzFD3Xj
-xW0ENF5lKwbXarFOHI6Njp7Xq96RO3nzTcy0+08AWHvVQOH+yWqBsaX8eYo1sxlG
-/70v/zLL7YPU8VTQBa7Jsj42q1j17N3OYvzk8/a2u5SD1a4tLIJEnltbpzwDFTKl
-vOxfEK7eXpYDg6+SHKaBK8WHszBXZUxxAJ+nwu4Ld4LLTM82lh9Fu4FNF6DnBGBg
-BGnfApyP5qUmXDCOgmjs
-=9Xnc
+iQIcBAABAgAGBQJRdfdYAAoJEN+cO+D+7b7vdR8P/AnvUGesRQsEpMucCv6bSc6q
+R8SckaRqU9mEfFSrSUdm7BNV1We71yU9f3mLqKIboSVBcpVrkqvOn64Kl2Hls0RP
+fXn77YMRLDZMMRDjfDycKer47o2NrXcJd0KWPGANTRvH4VXT38bL0QFSKix2jQCX
+9wtI6mEQCNJxFNGvy9flJn2JN8rs8CS17cuWl3gUBGLEn7Oa1es1xGL1KR0byKvc
+epeH21qEOXSspUPmIrYmyZMOn9dkeigcHqlG+zZS0NZSymw7qe45ddm26kINbNds
+kyE5hoyJgr4Bab9VRygOkgOJoVjH5AARAyB516m2zjnqzGo5uIjTiM+4ASaQZiez
+FHmlk0dk88iPJWQg+1teqQDHU5CIH/1rP9wstn35pSNa1BigGTcisOG/kcBzJMmc
+x1kNUH3SZd67/0knWBYKbKNJ5SCzKZtcymc34X8UJOSL2uu9RMWxVH0d/GTckqDF
+Lsh+LM6cLLjmOGCeEBeY4keglPY31bbeOg8p3iX6pyV+FdODHKYCigTID73z3mg7
+YVq1JzyVNMSBLwIeX1GsQaMFWsRXKgE+TifFwJx2C3JiMHsgMW6zkPEmD3YzloN/
+CUPHtz43GZY52uzhczezQlNYPlx+g4m6GDs8Gfp32ABffsmJczisqXWfbV3REhuR
+ohsVKvbzAB/TlHiw1qPs
+=tBj4
 -----END PGP SIGNATURE-----
diff --git a/wiki/preview/ikiwiki-fdo-preview.sh b/wiki/preview/ikiwiki-fdo-preview.sh
index 383cb39..3444d38 100644
--- a/wiki/preview/ikiwiki-fdo-preview.sh
+++ b/wiki/preview/ikiwiki-fdo-preview.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-#set -ex
+#set -x
+set -e
 
 OUTPUTDIR="$( mktemp -d )"
 trap 'rm -rf ${OUTPUTDIR}' EXIT
diff --git a/wiki/preview/ikiwiki-fdo-preview.sh.asc b/wiki/preview/ikiwiki-fdo-preview.sh.asc
index 0341512..d89a676 100644
--- a/wiki/preview/ikiwiki-fdo-preview.sh.asc
+++ b/wiki/preview/ikiwiki-fdo-preview.sh.asc
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
-iQIcBAABAgAGBQJRdfJRAAoJEN+cO+D+7b7vWTMP/2KaJLgFL8JYV0GyiP7HWIOf
-BCi1laXGkbm38upQorS/CX67gcM0vDOp5RRLjjZnXBm8JVljxp1Ain2wJTwIIGi6
-p7frlxAl6Wl0ZJFjocLJu+ignVgWHPMpaIhbO2bOfgrBTdZLHgVopxJ8iTKsfJlo
-lpQYs+77KObAzP8TpwIeWwcUv9cpvTx1BCUS8+gB3HP3kQ714w8DQjUFI6WTuK4b
-GTIT7/hSQW8EmDxXyhgFzCcXf3MDTLPJpKX5DV8J4OK9F+767BHm/Di75bk/Cuxg
-CB6/PtUMuLk1fhtZQ+jzjOUZz3jog1rlr1cXXCBdjkkrkDf0utigXXrW8SCREHoz
-gNQHNC7DqAj6KR4D5VLztzkH0OW4OwkYBX7deNeu/umh/tEpbb1AHA9MGDUD3XuZ
-ryxGzcPozDC9dxRbZ2I6TNM2wp+fVgwZKySytw3F4EVCihflZNG3Vh3QSHaf/a5c
-V0XEqH8ihPsesFHY5lhhCZRWAPSO4uP9FaJ9anFQGYl9PrHgd9YPDL1PZ+ArR7WY
-4NiusxKWMafTbP4GEmopZixVrSiFFndOsyGAV8cMxMDqIRo5rYxXBG97QBqbedpg
-S42yaMN2vOeGJMlGHB5TN7kk4Gn6ueZ7FY7SEDMt4IeUF4ukdVcmoJ9gtoFj2/4F
-jyzXs87Mp5xWVqBbKvHi
-=KaLu
+iQIcBAABAgAGBQJRdfdeAAoJEN+cO+D+7b7vdJcP/0BfSkLUgjTFjhteYKOyelRp
+CmMJW0455skgu5O7VdcO6C9kKAUJUrNQmOxZhMofJpp4teX6a9lcWetvbpz5BwrQ
+vDqylGnkR6W1TqAeNaxTScQ11sSFHCBiL5cWy7mAQ4syOiPlE3kLHzKav0dWbt4B
+nCq+ABJs+zy131OZJX6wd77d8AgEw6sQ+JBMpxnME0GxgvF7Fch5BSyilBRrYE+U
+lgL+XkqQdwc5nz+wKondnDJKToq4RjJrh2mK/9mysl8Q63qzQFICWbZMtJBW3qbS
+N0DlUi++q1Fuz6EjTZwv5A9FpgTkI75hqSPMeVqEdPddpZS+i0C1lEbGF0Lwqnnd
+s4r1NYXQptl3Xzwiv0prNkYznNV2pU96+our9q1rHhdnMGflYwrGJnuc0dq60pRW
+Wxij/b1QtM8MwESb6KrH8VmWGBgpHjRW5+PMj4ounegREczejUck3zb1luNapThb
+JzGJr17p2CpAiPzuTihsKbr83IsVxH2Z3pRUV2zMWZ15TKjXXk1ek3tKHenHceoj
+HfkB7gDSOO6LzZM080uYZ48ija3iiijU/tz/J5TAD8+Rr0Dz0O+r7TAc0cYzHSk5
+GDaxjgfTWri2L1Oroxn/2nhfHaG21jgNZVx76AaAlaMl3t5ErUBXaF3szo5b1c9U
+1m/S+/+f/h68tz2TruDC
+=ogtf
 -----END PGP SIGNATURE-----