X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=bin%2Fupdate-wiki;h=feb93d89eecc05cef3ca5a93c16a5c5aa70b3167;hb=db0f8ca3603c89a610b61b1b673fdf45215a9b53;hp=f4578dd803fafb0a180ef39916315a0f604b680a;hpb=d2c84b9baa687c60f177f75bcf8e4064a607aeb4;p=mirror%2Fdsa-wiki.git diff --git a/bin/update-wiki b/bin/update-wiki index f4578dd..feb93d8 100755 --- a/bin/update-wiki +++ b/bin/update-wiki @@ -6,8 +6,11 @@ umask 0002 WC="/org/dsa.debian.org/dsa-wiki" DEST="/org/dsa.debian.org/htdocs" URL="http://dsa.debian.org/" +UPDATE=1 -cd "$WC" && env -i git pull +! [ -e "$HOME/.dsa-wiki-local" ] || . "$HOME/.dsa-wiki-local" + +[ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull ) env -i ikiwiki \ --timeformat '%F' \