CryHavoc
/
dottes
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.cryhavoc.org.uk/dottes

This commit is contained in:
Jim Hague 2014-06-30 10:02:49 +01:00
parent cefaebef13 eb38b7dd10
commit eb7bcf8ff7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makeWeb.sh
View File

@ -52,13 +52,14 @@ fi
dir=`pwd` dir=`pwd`
booke=$1
masterbooke=$2
bookedir=$dir/$1 bookedir=$dir/$1
masterbookedir=$dir/$2
webdir=$dir/web/$1 webdir=$dir/web/$1
graphicsdir=$dir/graphics/$1 graphicsdir=$dir/graphics/$1
output=index.html output=index.html
tunelist=tunelist.html tunelist=tunelist.html
booke=$1
masterbooke=$2
title=$booke title=$booke
instrument=$3 instrument=$3
abc2xml=$dir/abc2xml/abc2xml.py abc2xml=$dir/abc2xml/abc2xml.py
@ -126,7 +127,7 @@ find $bookedir -name "*.abc" | sort |
if [ -n "$credit" ]; then if [ -n "$credit" ]; then
creditvisibility="yes" creditvisibility="yes"
fi 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` key=`$dir/abcfield.py --field K $filename`
fixkey $key fixkey $key
key=$retval key=$retval