Mercurial > dottes
changeset 505:b6e4f4d7665a build-default-214
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author | Jim Hague <jim.hague@acm.org> |
---|---|
date | Mon, 30 Jun 2014 10:02:49 +0100 |
parents | 56ddc6ef7b1a (current diff) 4cc739fe13ab (diff) |
children | 5232216a6444 b44fbcaeba38 |
files | |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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