# HG changeset patch # User Jim Hague # Date 1404118969 -3600 # Node ID b6e4f4d7665ab4b830abf087d8826b3c11961768 # Parent 56ddc6ef7b1afbc6be5c3ad3e6a2c19c24ab5cae# Parent 4cc739fe13ab42a249b569e89501ccab66a96888 Automated merge with ssh://hg.cryhavoc.org.uk/dottes diff -r 56ddc6ef7b1a -r b6e4f4d7665a makeWeb.sh --- a/makeWeb.sh Fri Jun 20 23:07:28 2014 +0100 +++ b/makeWeb.sh Mon Jun 30 10:02:49 2014 +0100 @@ -52,13 +52,14 @@ dir=`pwd` +booke=$1 +masterbooke=$2 bookedir=$dir/$1 +masterbookedir=$dir/$2 webdir=$dir/web/$1 graphicsdir=$dir/graphics/$1 output=index.html tunelist=tunelist.html -booke=$1 -masterbooke=$2 title=$booke instrument=$3 abc2xml=$dir/abc2xml/abc2xml.py @@ -126,7 +127,7 @@ if [ -n "$credit" ]; then creditvisibility="yes" fi - lastchanged=`hg log --limit 1 --template "{date|shortdate}" $filename` + lastchanged=`hg log --limit 1 --template "{date|shortdate}" $masterbookedir/${name}.abc` key=`$dir/abcfield.py --field K $filename` fixkey $key key=$retval