X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=bin%2Fupdate-wiki;h=2cee32e041bc0d356f717910964ae6789dda60c9;hb=7218ca8bb78e99ba57f5c387bb7059c12e90f237;hp=3547c28cf5bdc3fc866ebc501deb5edd54b3a807;hpb=13084b3ea11689e3881c216f1f1e0f957e741532;p=mirror%2Fdsa-wiki.git

diff --git a/bin/update-wiki b/bin/update-wiki
index 3547c28..2cee32e 100755
--- a/bin/update-wiki
+++ b/bin/update-wiki
@@ -10,9 +10,16 @@ UPDATE=1
 
 ! [ -e "$HOME/.dsa-wiki-local" ] || . "$HOME/.dsa-wiki-local"
 
-[ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull )
+[ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull --quiet )
 
-env -i ikiwiki \
+if [ "$UPDATE" != 1 ]; then
+	GITPLUGIN=""
+else
+	GITPLUGIN="--plugin git"
+fi
+
+env -i "HOME=$HOME" \
+    ikiwiki \
 	--timeformat '%F' \
 	--wikiname 'DSA' \
 	--url "$URL" \
@@ -20,18 +27,20 @@ env -i ikiwiki \
 	--underlaydir "$WC/underlay" \
 	--templatedir "$WC/templates" \
 	--no-discussion \
-	--refresh \
-        --atom \
-        --rss \
+	--atom \
+	--rss \
 	--plugin template \
 	--plugin toggle \
 	--plugin inline \
 	--plugin sidebar \
 	--plugin table \
+	--plugin mdwn \
 	--plugin creole \
-	--plugin git \
+	$GITPLUGIN \
 	--disable-plugin openid \
 	--disable-plugin sandbox \
 	--disable-plugin passwordauth \
+	--set multimarkdown=1 \
+	--refresh \
 	"$WC/input" \
 	"$DEST"